Version 1.1.4 supplemental update

Author: reactive-firewall

.appveyor.yml

@@ -1,13 +1,13 @@
-version: 1.0.{build}
+version: 1.1.{build}
 branches:
   only:
   - master
   - stable
 skip_tags: true
 max_jobs: 1
 image:
-- Visual Studio 2017
-- Visual Studio 2015
+- Visual Studio 2022
+- Visual Studio 2019
 clone_depth: 50
 init:
 - cmd: >-

.circleci/config.yml

@@ -2,9 +2,9 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/python:3.6.1
       - image: circleci/python:3.7
       - image: circleci/python:3.8
+      - image: circleci/python:3.9
     environment:
       CI: cicleci
       DEBIAN_FRONTEND: noninteractive
@@ -41,9 +41,9 @@ jobs:
 
   test:
     docker:
-      - image: circleci/python:3.6.1
       - image: circleci/python:3.7
       - image: circleci/python:3.8
+      - image: circleci/python:3.9
     parallelism: 2
     environment:
       CI: cicleci
@@ -88,9 +88,9 @@ jobs:
 
   pytest:
     docker:
-      - image: circleci/python:3.6.1
       - image: circleci/python:3.7
       - image: circleci/python:3.8
+      - image: circleci/python:3.9
     parallelism: 2
     environment:
       CI: cicleci
@@ -147,7 +147,7 @@ jobs:
 
   lint:
     docker:
-      - image: circleci/python:3.6.1
+      - image: circleci/python:3.8
     environment:
       CI: cicleci
       DEBIAN_FRONTEND: noninteractive

.gitignore

@@ -47,6 +47,7 @@ coverage.xml
 codecov_env
 *,cover
 .hypothesis/
+test-reports/*
 
 # Translations
 *.mo

LICENSE.md

@@ -1,6 +1,6 @@
 License - MIT
 
-Copyright (c) 2017-2020 Mr. Walls
+Copyright (c) 2017-2022 Mr. Walls
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

Makefile

@@ -59,6 +59,7 @@ PHONY: must_be_root cleanup
 
 build:
 	$(QUIET)$(ECHO) "No need to build. Try make -f Makefile install"
+	$(QUIET)$(MAKE) -s -C ./docs/ -f Makefile text 2>/dev/null || true
 
 init:
 	$(QUIET)$(ECHO) "$@: Done."
@@ -84,7 +85,7 @@ purge: clean uninstall
 test: cleanup
 	$(QUIET)coverage run -p --source=pythonrepo -m unittest discover --verbose -s ./tests -t ./ || python3 -m unittest discover --verbose -s ./tests -t ./ || python -m unittest discover --verbose -s ./tests -t ./ || DO_FAIL=exit 2 ;
 	$(QUIET)coverage combine 2>/dev/null || true
-	$(QUIET)coverage report --include=pythonrepo* 2>/dev/null || true
+	$(QUIET)coverage report -m --include=pythonrepo* 2>/dev/null || true
 	$(QUIET)$(DO_FAIL);
 	$(QUIET)$(ECHO) "$@: Done."
 

docs/conf.py

@@ -32,7 +32,7 @@
 templates_path = ['_templates']
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = '.md'
 
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
@@ -51,7 +51,7 @@
 # The short X.Y version.
 version = 'v1.1'
 # The full version, including alpha/beta/rc tags.
-release = 'v1.1.1'
+release = 'v1.1.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst renamed to docs/index.md

@@ -2,7 +2,7 @@
 
 # Python Repo Template
 # ..................................
-# Copyright (c) 2017-2019, Kendrick Walls
+# Copyright (c) 2017-2022, Kendrick Walls
 # ..................................
 # Licensed under MIT (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,25 +17,33 @@
 # limitations under the License.
 
 
-__version__ = """1.1.1"""
-"""This is version 1.1.1 of pythonrepo Template"""
+__package__ = """pythonrepo"""
+
+
+__module__ = """pythonrepo"""
+
+
+__name__ = """pythonrepo"""
+
+
+__version__ = """1.1.4"""
+"""This is version 1.1.4 of pythonrepo Template"""
 
 
 try:
 	import sys
 	import os
-	if 'pythonrepo' in __file__:
+	if str(__module__) in __file__:
 		__parentPath = os.path.join(
 			os.path.dirname(__file__), '..'
 		)
 		sys.path.insert(0, os.path.abspath(__parentPath))
-except Exception as ImportErr:
-	print(str(type(ImportErr)))
-	print(str(ImportErr))
-	print(str((ImportErr.args)))
-	ImportErr = None
-	del ImportErr
-	raise ImportError(str("pythonrepo Failed to Import"))
+except Exception as err:
+	baton = ImportError(err, str("[CWE-758] Module failed completely."))
+	baton.module = __module__
+	baton.path = __file__
+	baton.__cause__ = err
+	raise baton
 
 
 try:

pythonrepo/__init__.py

@@ -18,22 +18,26 @@
 # limitations under the License.
 
 
+__module__ = """pythonrepo"""
+
+
+# __name__ = """pythonrepo"""
+
+
 try:
 	import sys
 	import argparse
 except Exception as err:
-	# Show Error Info
-	print(str(type(err)))
-	print(str(err))
-	print(str(err.args))
-	print(str(""))
-	# Clean up Error
-	err = None
+	# Collect Error Info
+	baton = ImportError(err, str("[CWE-758] Module failed completely."))
+	baton.module = __module__
+	baton.path = __file__
+	baton.__cause__ = err
 	# Throw more relevant Error
-	raise ImportError(str("Error Importing Python"))
+	raise baton
 
 
-__prog__ = str("""pythonrepo""")
+__prog__ = str(__module__)
 """The name of this program is PythonRepo"""
 
 
@@ -49,7 +53,7 @@
 """Contains the short epilog of the program CLI help text."""
 
 
-__version__ = """1.1.1"""
+__version__ = """1.1.4"""
 """The version of this program."""
 
 
@@ -95,16 +99,9 @@ def parseArgs(arguments=None):
 	return parser.parse_known_args(arguments)
 
 
-def __checkToolArgs(args=None):
-	"""Handles None case for arguments as a helper function."""
-	if args is None:
-		args = [None]
-	return args
-
-
-def useTool(tool, arguments=None):
+def useTool(tool, *arguments):
 	"""Handler for launching the functions."""
-	arguments = __checkToolArgs(arguments)
+	# arguments = __checkToolArgs(arguments)
 	if (tool is not None) and (tool in TASK_OPTIONS.keys()):
 		try:
 			# print(str("launching: " + tool))
@@ -117,11 +114,11 @@ def useTool(tool, arguments=None):
 		return None
 
 
-def main(argv=None):
+def main(*argv):
 	"""The Main Event."""
 	try:
 		try:
-			args, extra = parseArgs(argv)
+			args, extra = parseArgs(*argv)
 			service_cmd = args.some_task
 			useTool(service_cmd, extra)
 		except Exception:

pythonrepo/pythonrepo.py

@@ -1,6 +1,6 @@
 [metadata]
 name = pythonrepo
-version = 1.1.3
+version = 1.1.4
 author = Mr. Walls
 author-email = [email protected]
 summary = python-repo template
@@ -13,6 +13,8 @@ classifiers =
 	Operating System :: POSIX :: Linux
 	Programming Language :: Python
 	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.7
 	Programming Language :: Python :: 3.6
 	Programming Language :: Python :: 3.5

setup.cfg

@@ -68,16 +68,19 @@ def test_the_help_command(self):
 
 	def test_corner_case_example(self):
 		"""Example Test case for bad input directly into function."""
-		theResult = False
+		theResult = True
 		try:
 			from .context import pythonrepo
 			if pythonrepo.__name__ is None:
 				theResult = False
-			from pythonrepo import pythonrepo as pythonrepo
-			self.assertIsNone(pythonrepo.useTool(None))
-			self.assertIsNone(pythonrepo.useTool("JunkInput"))
-			theResult = True
+			from pythonrepo import pythonrepo as _pythonrepo
+			self.assertIsNone(_pythonrepo.useTool(None, None), """None, None Failed""")
+			self.assertIsNone(_pythonrepo.useTool(None, []), """None, [] Failed""")
+			self.assertIsNone(_pythonrepo.useTool(tool=None), """None Failed""")
+			self.assertIsNone(_pythonrepo.useTool("JunkInput"), """junk Failed""")
+			self.assertTrue(theResult)
 		except Exception:
+			self.fail("""Test Failed""")
 			theResult = False
 		assert theResult