Merge pull request #69 from jcapriot/pyproject

Pyproject.toml

Author: jcapriot

.git_archival.txt

@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
+ref-names: $Format:%D$

.gitattributes

@@ -0,0 +1,13 @@
+.git_archival.txt  export-subst
+# Excluding files from an sdist generated by meson-python
+
+.github/* export-ignore
+docs/* export-ignore
+examples/* export-ignore
+tests/* export-ignore
+
+.coveragerc export-ignore
+.flake8 export-ignore
+.git* export-ignore
+*.yml export-ignore
+*.yaml export-ignore

.github/workflows/test_with_conda.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v2
@@ -35,11 +35,14 @@ jobs:
           libdlf
           cython
           setuptools_scm
+          meson-python>=0.14.0
+          meson
+          ninja
+          build
           discretize
           matplotlib
           jupyter
           utm
-          numba
           pytest
           pytest-cov
           sphinx
@@ -49,16 +52,20 @@ jobs:
           graphviz
           pillow
         cache-environment: true
+    - name: Install numba
+      if: matrix.python-version != '3.12'
+      # Numba doesn't work on python 3.12 just yet, so conditionally install it into the environment:
+      run: |
+        micromamba install numba
     - name: Install Our Package
       run: |
-        export BUILD_GEOANA_EXT=1
-        pip install -e .
+        pip install --no-build-isolation --editable . --config-settings=setup-args="-Dwith_extensions=true"
         conda list
     - name: Run Tests
       run: |
         pytest --cov-config=.coveragerc --cov=geoana --cov-report=xml -s -v -W ignore::DeprecationWarning
     - name: "Upload coverage to Codecov"
-      if: ${{ matrix.python-version }} == '3.10'
+      if: matrix.python-version == '3.11'
       uses: codecov/codecov-action@v3
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -84,6 +91,10 @@ jobs:
           libdlf
           cython
           setuptools_scm
+          meson-python>=0.14.0
+          meson
+          ninja
+          build
           discretize
           matplotlib
           jupyter
@@ -100,8 +111,7 @@ jobs:
         cache-environment: true
     - name: Prepare source distribution
       run: |
-        export BUILD_GEOANA_EXT=1
-        python setup.py sdist
+        python -m build --no-isolation --skip-dependency-check --sdist . --config-settings=setup-args="-Dwith_extensions=true"
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
@@ -110,8 +120,7 @@ jobs:
         skip_existing: true
     - name: Install package
       run: |
-        export BUILD_GEOANA_EXT=1
-        pip install -e .
+        pip install --no-build-isolation --editable . --config-settings=setup-args="-Dwith_extensions=true"
     - name: Build documentation
       run: |
         cd docs

MANIFEST.in

@@ -4,17 +4,19 @@
 
 __author__ = 'SimPEG developers'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2017 SimPEG developers'
+__copyright__ = 'Copyright 2023 SimPEG developers'
+
+from importlib.metadata import version, PackageNotFoundError
 
 # Version
 try:
     # - Released versions just tags:       0.8.0
     # - GitHub commits add .dev#+hash:     0.8.1.dev4+g2785721
     # - Uncommitted changes add timestamp: 0.8.1.dev4+g2785721.d20191022
-    from geoana.version import version as __version__
-except ImportError:
+    __version__ = version("geoana")
+except PackageNotFoundError:
     # If it was not installed, then we don't know the version. We could throw a
-    # warning here, but this case *should* be rare. discretize should be
+    # warning here, but this case *should* be rare. geoana should be
     # installed properly!
     from datetime import datetime
 

geoana/__init__.py

@@ -0,0 +1,10 @@
+
+python_sources = [
+  '__init__.py',
+  'oksar.py',
+]
+
+py.install_sources(
+  python_sources,
+  subdir: 'geoana/earthquake'
+)

geoana/earthquake/meson.build

@@ -0,0 +1,14 @@
+
+python_sources = [
+  '__init__.py',
+  'base.py',
+  'halfspace.py',
+  'layered.py',
+  'simple_functions.py',
+  'wholespace.py',
+]
+
+py.install_sources(
+  python_sources,
+  subdir: 'geoana/em/fdem'
+)

geoana/em/fdem/meson.build

@@ -0,0 +1,14 @@
+
+python_sources = [
+  '__init__.py',
+  'base.py',
+]
+
+py.install_sources(
+  python_sources,
+  subdir: 'geoana/em'
+)
+
+subdir('fdem')
+subdir('static')
+subdir('tdem')

geoana/em/meson.build

@@ -0,0 +1,13 @@
+
+python_sources = [
+  '__init__.py',
+  'freespace.py',
+  'halfspace.py',
+  'sphere.py',
+  'wholespace.py',
+]
+
+py.install_sources(
+  python_sources,
+  subdir: 'geoana/em/static'
+)