Merge branch 'main' of https://github.com/johntruckenbrodt/spatialist …

…into feature/geo_interface

.github/workflows/python-package-conda.yml

@@ -1,53 +1,37 @@
 name: conda build
 
-on: [ push ]
+on: [ "push" ]
 
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
+  linux:
+    runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: conda-incubator/setup-miniconda@v3
         with:
+          miniconda-version: "latest"
           python-version: '3.10'
-      - name: Set paths and variables windows
-        if: startsWith(matrix.os, 'windows')
-        run: |
-          echo "$env:CONDA\condabin" | Out-File -FilePath $env:GITHUB_PATH -Append
-          echo "$env:CONDA\Scripts" | Out-File -FilePath $env:GITHUB_PATH -Append
-          echo "$env:CONDA\Library\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
-          echo "PROJ_DATA=$env:CONDA\Library\share\proj" | Out-File -FilePath $env:GITHUB_ENV -Append
-      - name: Set paths and variables
-        if: ${{ ! startsWith(matrix.os, 'windows') }}
-        run: |
-          echo "$CONDA/bin" >> $GITHUB_PATH
-          echo "PROJ_DATA=$CONDA/share/proj" >> $GITHUB_ENV
-      - name: Install dependencies
-        run: |
-          conda env update --file environment.yml --name base
+          environment-file: environment.yml
       - name: Lint with flake8
-        if: startsWith(matrix.os, 'ubuntu')
+        shell: bash -el {0}
         run: |
           conda install flake8
           # stop the build if there are Python syntax errors or undefined names
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
       - name: Install package
+        shell: bash -el {0}
         run: |
           pip install .
       - name: Test with pytest
+        shell: bash -el {0}
         run: |
           conda install pytest coverage
           coverage run -m pytest
+          coverage xml
       - name: Publish to coveralls.io
-        uses: coverallsapp/github-action@v2
+        uses: coverallsapp/github-action@v2.3.0
         with:
-          github-token: ${{ github.token }}
+          path-to-lcov: coverage.xml
+          github-token: ${{ secrets.GITHUB_TOKEN }}

environment-doc.yml

@@ -6,7 +6,7 @@ dependencies:
   - python>=3.8
   - progressbar2
   - pathos>=0.2
-  - numpy
+  - numpy<2.0
   - matplotlib-base
   - tblib
   - pyyaml

environment.yml

@@ -6,7 +6,7 @@ dependencies:
   - python>=3.8
   - progressbar2
   - pathos>=0.2
-  - numpy
+  - numpy<2.0
   - matplotlib-base
   - tblib
   - pyyaml

requirements.txt

@@ -1,6 +1,6 @@
 progressbar2
 pathos>=0.2
-numpy
+numpy<2.0
 tblib
 pyyaml
 dill