Possibly fix tests

ThomasWilshaw · Sep 30, 2024 · 71140a4 · 71140a4
1 parent d67c286
commit 71140a4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/lib/Colourimetry.py → tcolour/Colourimetry.py b/lib/Colourimetry.py → tcolour/Colourimetry.py
@@ -1,5 +1,5 @@
 from enum import Enum
-import TransferCharacteristic as TC
+from . import TransferCharacteristic as TC
 
 class RGBPrimaries():
     """Defines a set of three RGB primaries using the CIE xy coordinate system."""

diff --git a/lib/TransferCharacteristic.py → tcolour/TransferCharacteristic.py b/lib/TransferCharacteristic.py → tcolour/TransferCharacteristic.py
diff --git a/lib/__init__.py → tcolour/__init__.py b/lib/__init__.py → tcolour/__init__.py
diff --git a/lib/requirements.txt → tcolour/requirements.txt b/lib/requirements.txt → tcolour/requirements.txt
diff --git a/lib/tcolour.py → tcolour/tcolour.py b/lib/tcolour.py → tcolour/tcolour.py
@@ -1,6 +1,6 @@
 import yaml
-import Colourimetry
-import TransferCharacteristic
+from . import Colourimetry
+from . import TransferCharacteristic
 import uritools
 
 class TColor():
@@ -149,7 +149,7 @@ def add_colour_space(self, colour_space):
     def print_colourimetry(self, descriptor):
         """Pretty prints the colourimetry data set for the given descriptor"""
 
-        item:Colourimetry = config.config[descriptor]
+        item:Colourimetry = self.config[descriptor]
         print("-", item.descriptor)
         print("\tRGB Primaries: " + item.primaries.__str__())
         print("\tAchromatic Centroid: ", item.achromatic)

diff --git a/tests/context.py b/tests/context.py
@@ -1,4 +1,6 @@
 import os
 import sys
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..\\tcolour')))
-import tcolour.tcolour as tc
+#print(sys.path)
+
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+import tcolour
diff --git a/tests/test_Colourimetry.py b/tests/test_Colourimetry.py
@@ -1,10 +1,10 @@
 import unittest
-import sys
-from .context import tc
+from tcolour import Colourimetry
+from tcolour import TransferCharacteristic as TC
 
 class TestColourimetry(unittest.TestCase):
     def test_valid(self):
-        col = tc.Colourimetry.Colourimetry()
+        col = Colourimetry.Colourimetry()
         # Should be invalid as nothing is set
         self.assertFalse(col.colourspace_valid())
 
@@ -18,5 +18,5 @@ def test_valid(self):
         # Should be invalid as still missing TC
         self.assertFalse(col.colourspace_valid())
 
-        col.transfer_characteristic = tc.TransferCharacteristic.TransferCharacteristicPower(parameters={'a': 2.2})
+        col.transfer_characteristic = TC.TransferCharacteristicPower(parameters={'a': 2.2})
         self.assertTrue(col.colourspace_valid())