From 71140a4a1e76be2ad2e2658b08c32f492cd0a4b5 Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Mon, 30 Sep 2024 14:29:51 +0100
Subject: [PATCH] Possibly fix tests

---
 {lib => tcolour}/Colourimetry.py           | 2 +-
 {lib => tcolour}/TransferCharacteristic.py | 0
 {lib => tcolour}/__init__.py               | 0
 {lib => tcolour}/requirements.txt          | 0
 {lib => tcolour}/tcolour.py                | 6 +++---
 tests/context.py                           | 6 ++++--
 tests/test_Colourimetry.py                 | 8 ++++----
 7 files changed, 12 insertions(+), 10 deletions(-)
 rename {lib => tcolour}/Colourimetry.py (98%)
 rename {lib => tcolour}/TransferCharacteristic.py (100%)
 rename {lib => tcolour}/__init__.py (100%)
 rename {lib => tcolour}/requirements.txt (100%)
 rename {lib => tcolour}/tcolour.py (98%)

diff --git a/lib/Colourimetry.py b/tcolour/Colourimetry.py
similarity index 98%
rename from lib/Colourimetry.py
rename to tcolour/Colourimetry.py
index 0b60f68..632eae8 100644
--- a/lib/Colourimetry.py
+++ b/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 b/tcolour/TransferCharacteristic.py
similarity index 100%
rename from lib/TransferCharacteristic.py
rename to tcolour/TransferCharacteristic.py
diff --git a/lib/__init__.py b/tcolour/__init__.py
similarity index 100%
rename from lib/__init__.py
rename to tcolour/__init__.py
diff --git a/lib/requirements.txt b/tcolour/requirements.txt
similarity index 100%
rename from lib/requirements.txt
rename to tcolour/requirements.txt
diff --git a/lib/tcolour.py b/tcolour/tcolour.py
similarity index 98%
rename from lib/tcolour.py
rename to tcolour/tcolour.py
index 918f977..00affb5 100644
--- a/lib/tcolour.py
+++ b/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
index 2d23dee..d43ed53 100644
--- 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
index f151c29..37fc105 100644
--- 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())
\ No newline at end of file