restructure package dir

WFP-VAM · Aug 30, 2023 · ef05cc4 · ef05cc4
1 parent 1b6126b
commit ef05cc4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 38 deletions.
diff --git a/_version/__init__.py b/_version/__init__.py
diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 name = vam.whittaker
 description = VAM whittaker core
-version = attr: ._version.__version__
+version = attr: vam.whittaker._version.__version__
 author = WFP-VAM
 author_email =
 maintainer = WFP-VAM
@@ -27,6 +27,11 @@ classifiers =
 [options]
 python_requires = >=3,<4
 
+
+[options.packages.find]
+include =
+  vam*
+
 [aliases]
 test=pytest
 

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 import numpy
 
-USE_CYTHON = "auto"
+USE_CYTHON = True  # "auto"
 
 if USE_CYTHON:
     try:
@@ -25,7 +25,7 @@
 if USE_CYTHON:
     ext_modules += [
         Extension(
-            "vam.whittaker",
+            "vam.whittaker._whit",
             ["vam/whittaker/_whittaker.pyx"],
             extra_compile_args=["-O3", "-ffast-math"],
         )
@@ -34,7 +34,7 @@
 else:
     ext_modules += [
         Extension(
-            "vam.whittaker",
+            "vam.whittaker._whit",
             ["vam/whittaker/_whittaker.c"],
             extra_compile_args=["-O3", "-ffast-math"],
         )

diff --git a/vam/whittaker/__init__.py b/vam/whittaker/__init__.py
@@ -1,3 +1,4 @@
 from ._version import __version__
+from ._whit import lag1corr, ws2d, ws2dp, ws2doptv, ws2doptvp
 
 __all__ = ("__version__",)
diff --git a/vam/whittaker/_version.py b/vam/whittaker/_version.py
@@ -1,12 +1 @@
-"""
-_version
-
-Version information for MODAPE whittaker core
-
-"""
-
-VERSION_MAJOR = 2
-VERSION_MINOR = 0
-VERSION_PATCH = 2
-
-__version__ = ".".join(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
+__version__ = "2.0.2"