From ef05cc4e54ada8dccb419529bfd0a6c59f6ea3a3 Mon Sep 17 00:00:00 2001
From: valpesendorfer <v.p@gmx.at>
Date: Wed, 30 Aug 2023 14:38:09 +0200
Subject: [PATCH] restructure package dir

---
 _version/__init__.py      | 22 ----------------------
 setup.cfg                 |  7 ++++++-
 setup.py                  |  6 +++---
 vam/whittaker/__init__.py |  1 +
 vam/whittaker/_version.py | 13 +------------
 5 files changed, 11 insertions(+), 38 deletions(-)
 delete mode 100644 _version/__init__.py

diff --git a/_version/__init__.py b/_version/__init__.py
deleted file mode 100644
index 63ecbb5..0000000
--- a/_version/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-_version
-
-Version information for MODAPE whittaker core
-
-"""
-
-__all__ = [
-    'VERSION_MAJOR',
-    'VERSION_MINOR',
-    'VERSION_PATCH',
-    'VERSION_STRING',
-    '__version__',
-]
-
-VERSION_MAJOR = 2
-VERSION_MINOR = 0
-VERSION_PATCH = 2
-
-VERSION_STRING = '%s.%s.%s' % (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
-
-__version__ = VERSION_STRING
diff --git a/setup.cfg b/setup.cfg
index 7a3643c..043f12a 100644
--- 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
index 31dccfc..854f838 100644
--- 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
index d374cc5..a26c4f5 100644
--- 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
index 99e047e..0309ae2 100644
--- 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"