fish2000 · KOLANICH · Feb 16, 2023 · Feb 16, 2023 · Feb 16, 2023 · Feb 16, 2023
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@
 
 dist
 build
+/*.egg-info
diff --git a/__init__.py → colorpy/__init__.py b/__init__.py → colorpy/__init__.py
diff --git a/blackbody.py → colorpy/blackbody.py b/blackbody.py → colorpy/blackbody.py
diff --git a/ciexyz.py → colorpy/ciexyz.py b/ciexyz.py → colorpy/ciexyz.py
diff --git a/colormodels.py → colorpy/colormodels.py b/colormodels.py → colorpy/colormodels.py
diff --git a/figures.py → colorpy/figures.py b/figures.py → colorpy/figures.py
diff --git a/illuminants.py → colorpy/illuminants.py b/illuminants.py → colorpy/illuminants.py
diff --git a/misc.py → colorpy/misc.py b/misc.py → colorpy/misc.py
diff --git a/plots.py → colorpy/plots.py b/plots.py → colorpy/plots.py
diff --git a/rayleigh.py → colorpy/rayleigh.py b/rayleigh.py → colorpy/rayleigh.py
diff --git a/thinfilm.py → colorpy/thinfilm.py b/thinfilm.py → colorpy/thinfilm.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,33 @@
+[build-system]
+requires = ["setuptools>=61.2"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "colorpy"
+version = "0.1.1"
+authors = [{name = "Mark Kness", email = "mkness@alumni.utexas.net"}]
+license = {text = "LGPL-3.0-or-later"}
+description = "Color calculations with physical descriptions of light spectra"
+
+[project.readme]
+text = "ColorPy is a Python package to convert physical descriptions of light spectra of light intensity vs. wavelength - into RGB colors that can be drawn on a computer screen. It provides a nice set of attractive plots that you can make of such spectra, and some other color related functions as well."
+content-type = "text/plain"
+
+[project.urls]
+Homepage = "http://markkness.net/colorpy/"
+"Source Code" = "https://github.com/fish2000/colorpy"
+"Issue Tracker" = "https://github.com/fish2000/colorpy/issues"
+
+[tool.setuptools]
+package-dir = {colorpy = "."}
+packages = ["colorpy"]
+include-package-data = false
+
+[tool.setuptools.package-data]
+colorpy = [
+    "README.rst",
+    "COPYING.txt",
+    "COPYING.LESSER.txt",
+    "license.txt",
+    "ColorPy.html",
+]
diff --git a/setup.py b/setup.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/test.py → tests/__main__.py b/test.py → tests/__main__.py
@@ -40,5 +40,6 @@ def test ():
     test_blackbody.test()
     test_rayleigh.test()
     test_thinfilm.test()
-
-
+
+if __name__ == "__main__":
+    test()
diff --git a/test_blackbody.py → tests/test_blackbody.py b/test_blackbody.py → tests/test_blackbody.py
@@ -26,7 +26,7 @@
 
 import math, random, numpy
 
-from . import colormodels, blackbody
+from colorpy import colormodels, blackbody
 
 STEFAN_BOLTZMAN = 5.670e-8        # W/(m^2 K^4)
 

diff --git a/test_ciexyz.py → tests/test_ciexyz.py b/test_ciexyz.py → tests/test_ciexyz.py
@@ -26,7 +26,7 @@
 
 import random
 
-from . import ciexyz
+from colorpy import ciexyz
 
 def test (verbose=0):
     '''Test the CIE XYZ conversions.  Mainly call some functions.'''

diff --git a/test_colormodels.py → tests/test_colormodels.py b/test_colormodels.py → tests/test_colormodels.py
@@ -25,7 +25,7 @@
 from __future__ import division, absolute_import, print_function
 
 import math, random, numpy
-from . import colormodels, ciexyz
+from colorpy import colormodels, ciexyz
 
 def test_xyz_rgb (verbose=1):
     '''Test that xyz_to_rgb() and rgb_to_xyz() are inverses.'''

diff --git a/test_illuminants.py → tests/test_illuminants.py b/test_illuminants.py → tests/test_illuminants.py
@@ -24,7 +24,7 @@
 '''
 from __future__ import division, absolute_import, print_function
 
-from . import illuminants
+from colorpy import illuminants
 
 def test (verbose=0):
     '''Mainly call some functions.'''

diff --git a/test_rayleigh.py → tests/test_rayleigh.py b/test_rayleigh.py → tests/test_rayleigh.py
@@ -26,7 +26,7 @@
 
 import random
 
-from . import rayleigh, illuminants
+from colorpy import rayleigh, illuminants
 
 def test ():
     '''Mainly call some functions.'''

diff --git a/test_thinfilm.py → tests/test_thinfilm.py b/test_thinfilm.py → tests/test_thinfilm.py
@@ -26,7 +26,7 @@
 
 import random
 
-from . import illuminants, thinfilm
+from colorpy import illuminants, thinfilm
 
 def test ():
     '''Module test.  Mainly call some functions.'''