Skip to content
This repository was archived by the owner on Jan 13, 2024. It is now read-only.

Commit 65f97e5

Browse files
authored
Merge pull request #16 from DirectiveAthena/v5.0.0_Proposal
V5.0.0 proposal
2 parents 08122f5 + 668ae6a commit 65f97e5

35 files changed

+279
-1116
lines changed

Tests/ColorObjects/test_ColorObjectConversions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import unittest
77

88
# Custom Library
9-
from AthenaColor.Objects.Color.ColorObjectConversion import *
10-
from AthenaColor.Objects.Color.ColorSystem import RGB,HEX,CMYK,HSL,HSV,RGBA,HEXA
9+
from AthenaColor.Color.ColorObjectConversion import *
10+
from AthenaColor.Color.ColorSystem import RGB,HEX,CMYK,HSL,HSV,RGBA,HEXA
1111

1212
# Custom Packages
1313
# ----------------------------------------------------------------------------------------------------------------------

Tests/ColorObjects/test_ColorTupleConversions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import unittest
77

88
# Custom Library
9-
from AthenaColor.Objects.Color.ColorTupleConversion import *
9+
from AthenaColor.Color.ColorTupleConversion import *
1010

1111
# Custom Packages
1212
# ----------------------------------------------------------------------------------------------------------------------

Tests/Data/test_ANSIcodes.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

Tests/Functions/test_ANSIsequences.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import unittest
77

88
# Custom Library
9-
from AthenaColor.Functions.ANSIsquences import ColorSequence, NestedColorSequence
9+
from AthenaColor.Functions.ANSIsequences import ColorSequence, NestedColorSequence
1010

1111
# Custom Packages
1212

Tests/Functions/test_BlendModes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import unittest
77

88
# Custom Library
9-
from AthenaColor.Objects.Color.ColorSystem import RGB, RGBA
10-
from AthenaColor.Functions.BlendModes import *
9+
from AthenaColor.Color.ColorSystem import RGB, RGBA
10+
from AthenaColor.Color.BlendModes import *
1111

1212

1313
# Custom Packages

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
setuptools.setup(
1616
name="AthenaColor",
17-
version="4.2.0",
17+
version="5.0.0",
1818
author="Andreas Sas",
1919
author_email="",
2020
description="Package to support full usage of RGB colors in the Console.",

src/AthenaColor/Functions/BlendModes.py renamed to src/AthenaColor/Color/BlendModes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# Custom Library
1111

1212
# Custom Packages
13-
from AthenaColor.Objects.Color.ColorSystem import ColorSystem, RGBA
14-
from AthenaColor.Objects.Color.ColorObjectConversion import to_RGBA
15-
from AthenaColor.Objects.Color.ColorTupleConversion import NormalizeRgba
13+
from AthenaColor.Color.ColorSystem import ColorSystem, RGBA
14+
from AthenaColor.Color.ColorObjectConversion import to_RGBA
15+
from AthenaColor.Color.ColorTupleConversion import NormalizeRgba
1616

1717
# ----------------------------------------------------------------------------------------------------------------------
1818
# - Support Code -

src/AthenaColor/Objects/Color/ColorObjectConversion.py renamed to src/AthenaColor/Color/ColorObjectConversion.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
# Custom Library
88

99
# Custom Packages
10-
import AthenaColor.Objects.Color.ColorTupleConversion as CTC
11-
from AthenaColor.Objects.Color.ColorSystem import ColorSystem,RGB,HEX,CMYK,HSL,HSV,RGBA,HEXA, color_conversions_mapped
10+
import AthenaColor.Color.ColorTupleConversion as CTC
11+
from AthenaColor.Color.ColorSystem import ColorSystem,RGB,HEX,CMYK,HSL,HSV,RGBA,HEXA, color_conversions_mapped
1212

1313
# ----------------------------------------------------------------------------------------------------------------------
1414
# - All -

src/AthenaColor/Objects/Color/ColorSystem.py renamed to src/AthenaColor/Color/ColorSystem.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# Custom Packages
1111
import AthenaColor.Functions.DunderFunctions as CSD
12-
from AthenaColor.Objects.Color.ColorTupleConversion import *
12+
from AthenaColor.Color.ColorTupleConversion import *
1313
from AthenaColor.InitClass import init
1414
from AthenaColor.Functions.Constraints import Constrain
1515

@@ -35,12 +35,13 @@ def wrapper(self,other:ColorSystem|int|tuple):
3535
# - Actual Color System -
3636
# ----------------------------------------------------------------------------------------------------------------------
3737
class ColorSystem(ABC):
38+
string_seperation=";"
3839
def __init__(self, *_):
3940
# no 'ColorSystem' can be created on its own
4041
raise PermissionError
4142

4243
def __str__(self)->str:
43-
return init.stringSeparation.join(str(c) for c in self)
44+
return self.string_seperation.join(str(c) for c in self)
4445

4546
@abstractmethod
4647
def __repr__(self)->str:...

0 commit comments

Comments
 (0)