Merge pull request #45 from DirectiveAthena/ClasherAdditions

additions to Clasher's code

Author: AnnaSasDev

Tests/test_ansi_sequences.py

@@ -1,10 +1,20 @@
+# ----------------------------------------------------------------------------------------------------------------------
+# - Package Imports -
+# ----------------------------------------------------------------------------------------------------------------------
+# General Packages
 import unittest
 
+# Custom Library
+
+# Custom Packages
 from AthenaColor.func.ansi_sequences import color_sequence
 from AthenaColor.func.ansi_sequences import color_sequence_nested
 from AthenaColor.func.ansi_sequences import color_sequence_nested_no_reset
 
 
+# ----------------------------------------------------------------------------------------------------------------------
+# - TestColorSequence -
+# ----------------------------------------------------------------------------------------------------------------------
 class TestColorSequence(unittest.TestCase):
     def test_color_sequence(self):
         for value, result in (
@@ -15,6 +25,9 @@ def test_color_sequence(self):
                 self.assertEqual(color_sequence(value), result)
 
 
+# ----------------------------------------------------------------------------------------------------------------------
+# - TestColorSequenceNested -
+# ----------------------------------------------------------------------------------------------------------------------
 class TestColorSequenceNested(unittest.TestCase):
     def setUp(self):
         self.testcases = (
@@ -33,11 +46,14 @@ def tearDown(self):
         self.testcases = None
 
     def test_color_sequence_nested(self):
-        for input_vals, result in self.testcases:
-            with self.subTest(msg=f'{input_vals!r}-{result}'):
-                self.assertEqual(color_sequence_nested(*input_vals), result)
+        for input_values, result in self.testcases:
+            with self.subTest(msg=f'{input_values!r}-{result}'):
+                self.assertEqual(color_sequence_nested(*input_values), result)
 
 
+# ----------------------------------------------------------------------------------------------------------------------
+# - TestColorSequenceNestedNoReset -
+# ----------------------------------------------------------------------------------------------------------------------
 class TestColorSequenceNestedNoReset(unittest.TestCase):
     def setUp(self):
         self.testcases = (
@@ -56,7 +72,7 @@ def tearDown(self):
         self.testcases = None
 
     def test_color_sequence_nested_no_reset(self):
-        for input_vals, result in self.testcases:
-            with self.subTest(msg=f'{input_vals!r}-{result}'):
-                self.assertEqual(color_sequence_nested_no_reset(*input_vals), result)
+        for input_values, result in self.testcases:
+            with self.subTest(msg=f'{input_values!r}-{result}'):
+                self.assertEqual(color_sequence_nested_no_reset(*input_values), result)
 

Tests/test_rgb_controlled.py

@@ -1,8 +1,17 @@
+# ----------------------------------------------------------------------------------------------------------------------
+# - Package Imports -
+# ----------------------------------------------------------------------------------------------------------------------
+# General Packages
 import unittest
 
-from AthenaColor.models.rgb_controlled import RgbControlled
+# Custom Library
 
+# Custom Packages
+from AthenaColor.models.rgb_controlled import RgbControlled
 
+# ----------------------------------------------------------------------------------------------------------------------
+# - TestRGBControlled -
+# ----------------------------------------------------------------------------------------------------------------------
 class TestRGBControlled(unittest.TestCase):
     def setUp(self):
         self.rgb_controlled = RgbControlled('38;2;')

Tests/test_rgb_controlled_nested.py

@@ -1,9 +1,18 @@
+# ----------------------------------------------------------------------------------------------------------------------
+# - Package Imports -
+# ----------------------------------------------------------------------------------------------------------------------
+# General Packages
 import unittest
 
+# Custom Library
+
+# Custom Packages
 from AthenaColor.models.rgb_controlled_nested import RgbControlledNested
 from AthenaColor.models.rgb_controlled_nested import RgbControlled
 
-
+# ----------------------------------------------------------------------------------------------------------------------
+# - TestRGBControlledNested -
+# ----------------------------------------------------------------------------------------------------------------------
 class TestRGBControlledNested(unittest.TestCase):
     def setUp(self):
         self.rgb_controlled_nested = RgbControlledNested(
@@ -26,14 +35,14 @@ def setUp(self):
 
 
     def test_rgb_controlled_nested(self):
-        for input_vals, result in self.testcases:
-            if isinstance(input_vals[-2], tuple):
-                obj = input_vals[:-2]
-                color = input_vals[-2]
-                sep = input_vals[-1]
+        for input_values, result in self.testcases:
+            if isinstance(input_values[-2], tuple):
+                obj = input_values[:-2]
+                color = input_values[-2]
+                sep = input_values[-1]
             else:
-                obj = input_vals[:-1]
-                color = input_vals[-1]
+                obj = input_values[:-1]
+                color = input_values[-1]
                 sep = ' '
 
             with self.subTest(msg=result):

setup.py

@@ -15,7 +15,7 @@ def readme_handler() -> str:
 
 def version_handler() -> str:
     # ------------------------------------------------------------------------------------------------------------------
-    version = 7,0,0 # <-- DEFINE THE VERSION IN A TUPLE FORMAT HERE
+    version = 7,0,1 # <-- DEFINE THE VERSION IN A TUPLE FORMAT HERE
     # ------------------------------------------------------------------------------------------------------------------
     version_str = ".".join(str(i) for i in version)
 
@@ -41,7 +41,10 @@ def version_handler() -> str:
     packages=setuptools.find_packages(where="src"),
     python_requires=">=3.7",
     classifiers=[
+        "Development Status :: 4 - Beta",
+        "Environment :: Console",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "Operating System :: OS Independent"
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
@@ -51,5 +54,6 @@ def version_handler() -> str:
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
+        "Topic :: Terminals"
     ]
 )