Merge pull request #37 from DirectiveAthena/v6.1.1

V6.2.0

Author: AnnaSasDev

Tests/ColorObjects/test_ColorObjectConversions.py

@@ -7,7 +7,7 @@
 
 # Custom Library
 from AthenaColor import *
-from AthenaColor.functions.color_object_conversion import *
+from AthenaColor.func.color_object_conversion import *
 
 # Custom Packages
 # ----------------------------------------------------------------------------------------------------------------------

Tests/ColorObjects/test_ColorTupleConversions.py

@@ -6,7 +6,7 @@
 import unittest
 
 # Custom Library
-from AthenaColor.functions.color_tuple_conversion import *
+from AthenaColor.func.color_tuple_conversion import *
 
 # Custom Packages
 # ----------------------------------------------------------------------------------------------------------------------

Tests/Functions/test_ANSIsequences.py

@@ -6,7 +6,7 @@
 import unittest
 
 # Custom Library
-from AthenaColor.functions.ansi_sequences import *
+from AthenaColor.func.ansi_sequences import *
 
 # Custom Packages
 

Tests/Functions/test_BlendModes.py

@@ -7,7 +7,7 @@
 
 # Custom Library
 from AthenaColor import *
-from AthenaColor.functions.blend_modes import *
+from AthenaColor.func.blend_modes import *
 
 
 # Custom Packages

Tests/Functions/test_Constraints.py

@@ -6,7 +6,7 @@
 import unittest
 
 # Custom Library
-from AthenaColor.functions.constrains import *
+from AthenaColor.func.constrains import *
 
 # Custom Packages
 

Tests/Functions/test_DunderFunctions.py

@@ -6,7 +6,7 @@
 import unittest
 
 # Custom Library
-from AthenaColor.functions.dunder_functions import *
+from AthenaColor.func.dunder_functions import *
 
 # Custom Packages
 

Tests/Functions/test_General.py

@@ -6,7 +6,7 @@
 import unittest
 
 # Custom Library
-from AthenaColor.functions.functions import *
+from AthenaColor.func.general import *
 
 # Custom Packages
 

setup.py

@@ -15,13 +15,10 @@ def readme_handler() -> str:
 
 def version_handler() -> str:
     # ------------------------------------------------------------------------------------------------------------------
-    version = 6,1,0 # <-- DEFINE THE VERSION IN A TUPLE FORMAT HERE
+    version = 6,2,0 # <-- DEFINE THE VERSION IN A TUPLE FORMAT HERE
     # ------------------------------------------------------------------------------------------------------------------
     version_str = ".".join(str(i) for i in version)
 
-    with open("src/AthenaColor/_info/_v.py", "w") as file:
-        file.write(f"def _version():\n    return '{version_str}'")
-
     return version_str
 
 # ----------------------------------------------------------------------------------------------------------------------

src/AthenaColor/__init__.py

@@ -20,13 +20,9 @@
 
 from AthenaColor.models.color_system import RGB, RGBA, HEX, HEXA, HSV, HSL, CMYK
 
-import AthenaColor.functions.color_tuple_conversion as color_tuple_conversion
-import AthenaColor.functions.color_object_conversion as color_object_conversion
+import AthenaColor.func.color_tuple_conversion as color_tuple_conversion
+import AthenaColor.func.color_object_conversion as color_object_conversion
 
 # apply the fix, so that in windows the colors are shown correctly
-from AthenaColor.functions.functions import fix_console as _fix_console
-_fix_console()
-
-# import the info function
-# noinspection PyProtectedMember
-from AthenaColor._info.info import info
+from AthenaColor.func.general import fix_console as _fix_console
+_fix_console()