Merge branch 'main' into 1.0.0_alpha

Author: jcapriot

.azure-pipelines/azure-pipelines-linux.yml

@@ -14,6 +14,8 @@ jobs:
         python.version: '3.9'
       linux-Python310:
         python.version: '3.10'
+      linux-Python311:
+        python.version: '3.11'
   steps:
 
   - bash: |
@@ -33,7 +35,7 @@ jobs:
   - bash: |
       source "${HOME}/conda/etc/profile.d/conda.sh"
       conda activate discretize-test
-      pip install -e .
+      pip install --no-build-isolation --editable .
     displayName: Install requirements and build
     condition: ne(variables['python.version'], '3.10')
 
@@ -48,8 +50,7 @@ jobs:
   - bash: |
       source "${HOME}/conda/etc/profile.d/conda.sh"
       conda activate discretize-test
-      export DISC_COV=1
-      pip install -e .
+      pip install --no-build-isolation --editable . --config-settings=setup-args="-Dcy_line_trace=true"
     displayName: Install requirements and build for Testing
     condition: eq(variables['python.version'], '3.10')
 

.azure-pipelines/azure-pipelines-osx.yml

@@ -11,6 +11,8 @@ jobs:
         python.version: '3.9'
       osx-Python310:
         python.version: '3.10'
+      linux-Python311:
+        python.version: '3.11'
   steps:
 
   - bash: |
@@ -30,7 +32,7 @@ jobs:
   - bash: |
       source "${HOME}/conda/etc/profile.d/conda.sh"
       conda activate discretize-test
-      pip install -e .
+      pip install --no-build-isolation --editable .
     displayName: Install requirements and build
 
   - script: |

.azure-pipelines/azure-pipelines-win.yml

@@ -11,6 +11,8 @@ jobs:
         python.version: '3.9'
       win-Python310:
         python.version: '3.10'
+      linux-Python311:
+        python.version: '3.11'
   steps:
 
   - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
@@ -31,7 +33,7 @@ jobs:
 
   - script: |
       call activate discretize-test
-      pip install -e .
+      pip install --no-build-isolation --editable .
     displayName: Build
 
   - script: |

.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,16 @@
+.git_archival.txt  export-subst
+# Excluding files from an sdist generated by meson-python
+
+.azure-pipelines/* export-ignore
+.ci/* export-ignore
+docs/* export-ignore
+examples/* export-ignore
+tests/* export-ignore
+tutorials/* export-ignore
+
+.coveragerc export-ignore
+.flake8 export-ignore
+.git* export-ignore
+*.yml export-ignore
+*.yaml export-ignore
+requirements_style.txt export-ignore

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.1a1
+    rev: 23.9.1
     hooks:
       - id: black
         language_version: python3

MANIFEST.in

@@ -25,7 +25,7 @@ stages:
       pool:
         vmImage: ubuntu-latest
       variables:
-        python.version: '3.8'
+        python.version: '3.9'
       steps:
         - script: |
             pip install -r requirements_style.txt
@@ -38,7 +38,7 @@ stages:
       pool:
         vmImage: ubuntu-latest
       variables:
-        python.version: '3.8'
+        python.version: '3.9'
       steps:
         - script: |
             pip install -r requirements_style.txt
@@ -53,6 +53,7 @@ stages:
     - template: ./.azure-pipelines/azure-pipelines-win.yml
 
 - stage: Deploy
+  displayName: "Deploy Source Wheels and Docs"
   condition: and(succeeded(), startsWith(variables['build.sourceBranch'], 'refs/tags/'))
   jobs:
     - job:
@@ -92,13 +93,14 @@ stages:
         - bash: |
             source "${HOME}/conda/etc/profile.d/conda.sh"
             conda activate discretize-test
-            pip install -e .
+            pip install --no-build-isolation --editable .
           displayName: Build package
 
         - bash: |
             source "${HOME}/conda/etc/profile.d/conda.sh"
             conda activate discretize-test
-            python setup.py sdist
+            python -m build --no-isolation --skip-dependency-check --sdist .
+            ls -la dist
             twine upload --skip-existing dist/*
           displayName: Deploy source
           env:
@@ -129,28 +131,78 @@ stages:
           env:
             GH_TOKEN: $(gh.token)
 
-    - job:
-      displayName: Windows Wheels
-      strategy:
-        matrix:
-          win-Python38:
-            python.version: '3.8'
-          win-Python39:
-            python.version: '3.9'
-          win-Python310:
-            python.version: '3.10'
-      pool:
-        vmImage: windows-latest
+    - job: linux
+      displayName: Build Linux wheels
+      pool: { vmImage: 'Ubuntu-20.04' }
+      steps:
+        - task: UsePythonVersion@0
+        - bash:
+            git fetch --tags
+          displayName: Fetch tags
+        - bash: |
+            set -o errexit
+            python3 -m pip install --upgrade pip
+            pip3 install cibuildwheel==2.16.2
+            pip3 install twine
+          displayName: Install dependencies
+        - bash: cibuildwheel --output-dir wheelhouse .
+          displayName: Build wheels
+        - script: twine upload --skip-existing wheelhouse/*
+          displayName: Upload to PYPI
+          env:
+            TWINE_USERNAME: $(twine.username)
+            TWINE_PASSWORD: $(twine.password)
+        - task: PublishBuildArtifacts@1
+          inputs: { pathtoPublish: 'wheelhouse' }
+
+    - job: macos
+      displayName: Build Mac wheels
+      pool: { vmImage: 'macOS-11' }
+      variables:
+        CIBW_ARCHS_MACOS: "x86_64 arm64"
       steps:
         - task: UsePythonVersion@0
-          inputs:
-            versionSpec: '$(python.version)'
-        - script: pip install numpy cython twine wheel setuptools_scm
-          displayName: Install build dependencies
-        - script: python setup.py bdist_wheel
-          displayName: Build Wheel
-        - script: twine upload --skip-existing dist/*
+        - bash:
+            git fetch --tags
+          displayName: Fetch tags
+        - bash: |
+            set -o errexit
+            python3 -m pip install --upgrade pip
+            python3 -m pip install cibuildwheel==2.16.2
+            python3 -m pip install twine
+          displayName: Install dependencies
+        - bash: cibuildwheel --output-dir wheelhouse .
+          displayName: Build wheels
+        - script: twine upload --skip-existing wheelhouse/*
+          displayName: Upload to PYPI
+          env:
+            TWINE_USERNAME: $(twine.username)
+            TWINE_PASSWORD: $(twine.password)
+        - task: PublishBuildArtifacts@1
+          inputs: { pathtoPublish: wheelhouse }
+
+    - job: windows
+      displayName: Build Windows wheels
+      pool: { vmImage: 'windows-2019' }
+      variables:
+        CIBW_ARCHS_WINDOWS: "AMD64"
+      steps:
+        - task: UsePythonVersion@0
+        - bash:
+            git fetch --tags
+          displayName: Fetch tags
+        - bash: |
+            set -o errexit
+            python -m pip install --upgrade pip
+            pip install cibuildwheel==2.16.2
+            pip install twine
+          displayName: Install dependencies
+        - bash: cibuildwheel --output-dir wheelhouse .
+          displayName: Build wheels
+        - script: twine upload --skip-existing wheelhouse/*
           displayName: Upload to PYPI
           env:
             TWINE_USERNAME: $(twine.username)
             TWINE_PASSWORD: $(twine.password)
+        - task: PublishBuildArtifacts@1
+          inputs: { pathtoPublish: 'wheelhouse' }

azure-pipelines.yml

@@ -0,0 +1,9 @@
+
+python_sources = [
+  '__init__.py',
+]
+
+py.install_sources(
+  python_sources,
+  subdir: 'discretize/Tests'
+)

discretize/Tests/meson.build

@@ -46,7 +46,6 @@
 try:
     from discretize.tree_mesh import TreeMesh
 except ImportError as err:
-    print(err)
     import os
 
     # Check if being called from non-standard location (i.e. a git repository)
@@ -56,29 +55,30 @@
         # Then we are being run from a repository
         raise ImportError(
             """
-            Unable to import TreeMesh.
+            It would appear that discretize is being imported from its source code
+            directory and is unable to load its compiled extension modules. Try changing
+            your directory and re-launching your python interpreter.
 
-            It would appear that discretize is being imported from its repository.
-            If this is intentional, you need to run:
-
-            python setup.py build_ext --inplace
-
-            to compile the cython code.
+            If this was intentional, you need to install discretize in an editable mode.
             """
         )
+    else:
+        raise err
 from discretize import tests
 
 __author__ = "SimPEG Team"
 __license__ = "MIT"
 __copyright__ = "2013 - 2023, SimPEG Developers, https://simpeg.xyz"
 
+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 discretize.version import version as __version__
-except ImportError:
+    __version__ = version("discretize")
+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
     # installed properly!