leaver2000 · leaver2000 · May 18, 2024 · sourcery-ai · May 18, 2024
diff --git a/.gitignore b/.gitignore
@@ -4,10 +4,11 @@ build/
 **/__pycache__/
 **/*.pyc
 **/*.so
-nzthermo/*.c
+src/nzthermo/*.c
 .egg/
 *.egg-info/
 .vscode/
 .coverage
 .reports/
-.trash/
+.trash/
+src/nzthermo/_version.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,16 +1,26 @@
 [build-system]
-requires = ["setuptools>=58.2.0", "wheel", "Cython>=0.29.23", "numpy>=1.23.4"]
+requires = [
+    "wheel>=0.37.1",
+    "setuptools>=64",
+    "setuptools_scm>=8",
+    "Cython>=0.29.23",
+    "numpy>=1.23.4",
+]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "nzthermo"
-version = "0.0.1"
+dynamic = ["version"]
 description = "(N, Z) Thermodynamics"
 authors = [{ name = "Jason Leaver", email = "leaver2000@gmail.com" }]
 dependencies = ['numpy']
 
-[tool.setuptools]
-packages = ["nzthermo"]
+[tool.setuptools.packages.find]
+where = ["src"]
+include = ["nzthermo"]
+
+[tool.setuptools_scm]
+write_to = "src/nzthermo/_version.py"
 
 [tool.pytest]
 testpaths = ["tests/"]

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 if tuple(sys.argv[1:3]) == ("clean", "--all"):
     # when switching between production and coverage we need to remove the _c.c file to
     # ensure that the cython code is recompiled with the correct compiler directives
-    for file in ("nzthermo/_c.c", "nzthermo/_datetime.c"):
+    for file in ("src/nzthermo/_c.c", "src/nzthermo/_datetime.c"):
-    for file in ("src/nzthermo/_c.c", "src/nzthermo/_datetime.c"):
+FILE_PATHS = ("src/nzthermo/_c.c", "src/nzthermo/_datetime.c")
+
+for file in FILE_PATHS:
+    print(f"removing {file}")
+    if os.path.exists(file):
-    for file in ("src/nzthermo/_c.c", "src/nzthermo/_datetime.c"):
+FILE_PATHS = ("src/nzthermo/_c.c", "src/nzthermo/_datetime.c")
+
+for file in FILE_PATHS:
+    print(f"removing {file}")
+    if os.path.exists(file):
         print(f"removing {file}")
         if os.path.exists(file):
             os.remove(file)
@@ -58,7 +58,7 @@
 extension_modules = [
     setuptools.Extension(
         "nzthermo._c",
-        ["nzthermo/_c.pyx"],
+        ["src/nzthermo/_c.pyx"],
         include_dirs=include_dirs,
         define_macros=define_macros,
         extra_compile_args=extra_compile_args,

diff --git a/nzthermo/__init__.py → src/nzthermo/__init__.py b/nzthermo/__init__.py → src/nzthermo/__init__.py
diff --git a/nzthermo/_c.pxd → src/nzthermo/_c.pxd b/nzthermo/_c.pxd → src/nzthermo/_c.pxd
diff --git a/nzthermo/_c.pyi → src/nzthermo/_c.pyi b/nzthermo/_c.pyi → src/nzthermo/_c.pyi
diff --git a/nzthermo/_c.pyx → src/nzthermo/_c.pyx b/nzthermo/_c.pyx → src/nzthermo/_c.pyx
diff --git a/nzthermo/_experimental/__init__.py → src/nzthermo/_experimental/__init__.py b/nzthermo/_experimental/__init__.py → src/nzthermo/_experimental/__init__.py
diff --git a/nzthermo/_experimental/_datetime.pyx → src/nzthermo/_experimental/_datetime.pyx b/nzthermo/_experimental/_datetime.pyx → src/nzthermo/_experimental/_datetime.pyx
diff --git a/nzthermo/_experimental/py_wbgt.pyx → src/nzthermo/_experimental/py_wbgt.pyx b/nzthermo/_experimental/py_wbgt.pyx → src/nzthermo/_experimental/py_wbgt.pyx
diff --git a/nzthermo/_experimental/wbgt.c → src/nzthermo/_experimental/wbgt.c b/nzthermo/_experimental/wbgt.c → src/nzthermo/_experimental/wbgt.c
diff --git a/nzthermo/_experimental/wbgt.h → src/nzthermo/_experimental/wbgt.h b/nzthermo/_experimental/wbgt.h → src/nzthermo/_experimental/wbgt.h
diff --git a/nzthermo/_typing.py → src/nzthermo/_typing.py b/nzthermo/_typing.py → src/nzthermo/_typing.py
diff --git a/nzthermo/const.py → src/nzthermo/const.py b/nzthermo/const.py → src/nzthermo/const.py
diff --git a/nzthermo/core.py → src/nzthermo/core.py b/nzthermo/core.py → src/nzthermo/core.py
diff --git a/nzthermo/functional.py → src/nzthermo/functional.py b/nzthermo/functional.py → src/nzthermo/functional.py
diff --git a/nzthermo/py.typed → src/nzthermo/py.typed b/nzthermo/py.typed → src/nzthermo/py.typed