WIP

GEOS-DEV · Mar 13, 2024 · c3f35d5 · c3f35d5
1 parent 04bacce
commit c3f35d5
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 49 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -16,7 +16,7 @@ jobs:
       max-parallel: 3
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        package-name: ["geos-ats", "geos-mesh-doctor", "geos-mesh-tools", "geos-xml-tools", "hdf5-wrapper", "pygeosx-tools", "geos-timehistory"]
+        package-name: ["geos-ats", "geos-mesh-doctor", "geos-mesh-tools", "geos-timehistory", "geos-xml-tools", "hdf5-wrapper", "pygeos-tools"]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/geos-xml-tools/pyproject.toml b/geos-xml-tools/pyproject.toml
@@ -10,12 +10,8 @@ maintainers = [
     {name = "Christopher Sherman", email = "[email protected]" }
 ]
 license = {text = "LGPL-2.1"}
-classifiers = [
-  "Development Status :: 4 - Beta",
-  "Programming Language :: Python"
-]
 
-requires-python = ">=3.6"
+requires-python = ">=3.8"
 
 dependencies = [
     "lxml>=4.5.0",

diff --git a/hdf5-wrapper/pyproject.toml b/hdf5-wrapper/pyproject.toml
@@ -2,6 +2,26 @@
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "geos-hdf5-wrapper"
+version = "0.2.0"
+description = "Simple wrapper for h5py objects"
+maintainers = [
+    {name = "Christopher Sherman", email = "[email protected]" }
+]
+license = "LGPL-2.1"
+
+requires-python = ">=3.8"
+
+dependencies = [
+    "h5py>=2.10.0",
+    "numpy>=1.16.2",
+]
+
+[project.scripts]
+    hdf5_wrapper_tests = hdf5wrapper.wrapper_tests:main
+
+
 [tool.mypy]
 python_version = "3.8"
 warn_return_any = true

diff --git a/hdf5-wrapper/setup.cfg b/hdf5-wrapper/setup.cfg
diff --git a/hdf5-wrapper/hdf5_wrapper/__init__.py → hdf5-wrapper/src/hdf5wrapper/__init__.py b/hdf5-wrapper/hdf5_wrapper/__init__.py → hdf5-wrapper/src/hdf5wrapper/__init__.py
diff --git a/hdf5-wrapper/hdf5_wrapper/py.typed → hdf5-wrapper/src/hdf5wrapper/py.typed b/hdf5-wrapper/hdf5_wrapper/py.typed → hdf5-wrapper/src/hdf5wrapper/py.typed
diff --git a/hdf5-wrapper/hdf5_wrapper/use_example.py → hdf5-wrapper/src/hdf5wrapper/use_example.py b/hdf5-wrapper/hdf5_wrapper/use_example.py → hdf5-wrapper/src/hdf5wrapper/use_example.py
diff --git a/hdf5-wrapper/hdf5_wrapper/wrapper.py → hdf5-wrapper/src/hdf5wrapper/wrapper.py b/hdf5-wrapper/hdf5_wrapper/wrapper.py → hdf5-wrapper/src/hdf5wrapper/wrapper.py
diff --git a/hdf5-wrapper/hdf5_wrapper/wrapper_tests.py → ...-wrapper/src/hdf5wrapper/wrapper_tests.py b/hdf5-wrapper/hdf5_wrapper/wrapper_tests.py → ...-wrapper/src/hdf5wrapper/wrapper_tests.py
diff --git a/pygeos-tools/pyproject.toml b/pygeos-tools/pyproject.toml
@@ -2,6 +2,28 @@
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "pygeosx-tools"
+version = "0.1.0"
+description = "Tools for interacting with pygeosx"
+author = [
+    {name = "Christopher Sherman", email = "[email protected]" }
+]
+license = {text = "LGPL-2.1"}
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python"
+]
+
+requires-python = ">=3.8"
+
+dependencies = [
+    "matplotlib",
+    "numpy",
+    "scipy",
+    "mpi4py",
+]
+
 [tool.mypy]
 python_version = "3.8"
 warn_return_any = true

diff --git a/pygeos-tools/setup.cfg b/pygeos-tools/setup.cfg
diff --git a/pygeos-tools/pygeosx_tools/__init__.py → pygeos-tools/src/pygeos/tools/__init__.py b/pygeos-tools/pygeosx_tools/__init__.py → pygeos-tools/src/pygeos/tools/__init__.py
diff --git a/pygeos-tools/pygeosx_tools/file_io.py → pygeos-tools/src/pygeos/tools/file_io.py b/pygeos-tools/pygeosx_tools/file_io.py → pygeos-tools/src/pygeos/tools/file_io.py
diff --git a/...tools/pygeosx_tools/mesh_interpolation.py → ...ls/src/pygeos/tools/mesh_interpolation.py b/...tools/pygeosx_tools/mesh_interpolation.py → ...ls/src/pygeos/tools/mesh_interpolation.py
diff --git a/pygeos-tools/pygeosx_tools/py.typed → pygeos-tools/src/pygeos/tools/py.typed b/pygeos-tools/pygeosx_tools/py.typed → pygeos-tools/src/pygeos/tools/py.typed
diff --git a/pygeos-tools/pygeosx_tools/well_log.py → pygeos-tools/src/pygeos/tools/well_log.py b/pygeos-tools/pygeosx_tools/well_log.py → pygeos-tools/src/pygeos/tools/well_log.py
diff --git a/pygeos-tools/pygeosx_tools/wrapper.py → pygeos-tools/src/pygeos/tools/wrapper.py b/pygeos-tools/pygeosx_tools/wrapper.py → pygeos-tools/src/pygeos/tools/wrapper.py