require spatialist>=0.15.1, req. file restructuring

Author: johntruckenbrodt

.github/workflows/conda-install.yml

@@ -5,6 +5,9 @@ on: [ push ]
 jobs:
   build-linux:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: micromamba-shell {0}
     services:
       postgres:
         image: postgis/postgis:16-3.4
@@ -15,10 +18,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3.10
-        uses: conda-incubator/setup-miniconda@v3
+        uses: mamba-org/setup-micromamba@v2
         with:
-          auto-update-conda: true
-          python-version: '3.10'
+          environment-file: environment.yml
+          cache-environment: true
+          init-shell: bash
+          generate-run-shell: true
+          post-cleanup: 'all'
       - name: Install ESA SNAP
         run: |
           wget -nv https://download.esa.int/step/snap/12.0/installers/esa-snap_all_linux-12.0.0.sh
@@ -30,8 +36,8 @@ jobs:
           echo "PROJ_DATA=$CONDA/share/proj" >> $GITHUB_ENV
       - name: Install python packages
         run: |
-          conda install -y python=3.10 flake8 pytest coverage
-          conda env update --file environment.yml --name base
+          micromamba install -y python=3.10 flake8 -n ps_test
+          micromamba env update --file environment-dev.yml -n ps_test
       - name: Lint with flake8
         run: |
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
@@ -42,13 +48,15 @@ jobs:
       - name: Test with pytest
         run: |
           coverage run -m pytest
+          coverage xml
         env:
           PGUSER: postgres
           PGPASSWORD: Password12!
       - name: Publish to coveralls.io
         uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ github.token }}
+          format: cobertura
 
   build-windows:
     runs-on: windows-latest
@@ -62,7 +70,7 @@ jobs:
           activate-environment: ps_test_dev
           auto-update-conda: true
           python-version: '3.12'
-          environment-file: environment-dev.yml
+          environment-file: environment.yml
           auto-activate-base: false
       - uses: nyurik/action-setup-postgis@v2
         with:
@@ -76,6 +84,9 @@ jobs:
           echo %CONDA%\Scripts>> %GITHUB_PATH%
           echo C:\esa-snap\bin>> %GITHUB_PATH%
           echo PROJ_DATA=%CONDA%\share\proj>> %GITHUB_ENV%
+      - name: Install python packages
+        run: |
+          conda env update --file environment-dev.yml --name ps_test_dev
       - name: Install pyroSAR
         run: |
           pip install .

environment-dev.yml

@@ -3,22 +3,5 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python>=3.8
-  - progressbar2
-  - numpy<2.0
-  - spatialist>=0.15.0
-  - pyyaml
-  - requests
-  - psycopg2
-  - sqlalchemy>=1.4,<2.0
-  - sqlalchemy-utils>=0.37
-  - geoalchemy2<0.14.0
-  - gdal>=2.4
-  - libgdal
-  - pillow
-  - lxml
-  - packaging
-  - libspatialite>=5.1.0
-  - coveralls
   - coverage
-  - pytest
+  - pytest

environment.yml

@@ -3,19 +3,19 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python>=3.8
-  - progressbar2
-  - numpy<2.0
-  - spatialist>=0.15.0
-  - pyyaml
-  - requests
-  - psycopg2
-  - sqlalchemy>=1.4,<2.0
-  - sqlalchemy-utils>=0.37
-  - geoalchemy2<0.14.0
   - gdal>=2.4
+  - geoalchemy2<0.14.0
   - libgdal
-  - pillow
+  - libspatialite>=5.1.0
   - lxml
+  - numpy<2.0
   - packaging
-  - libspatialite>=5.1.0
+  - pillow
+  - progressbar2
+  - psycopg2
+  - python>=3.8
+  - pyyaml
+  - requests
+  - spatialist>=0.15.1
+  - sqlalchemy>=1.4,<2.0
+  - sqlalchemy-utils>=0.37

readthedocs.yml

@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: "ubuntu-22.04"
+  os: "ubuntu-24.04"
   tools:
-    python: "mambaforge-22.9"
+    python: "mambaforge-latest"
 
 conda:
   environment: environment-doc.yml

requirements.txt

@@ -1,12 +1,12 @@
-progressbar2
+geoalchemy2<0.14.0
+lxml
 numpy<2.0
-spatialist>=0.15.0
+packaging
+pillow
+progressbar2
+psycopg2
 pyyaml
 requests
-psycopg2
-SQLAlchemy>=1.4,<2.0
-SQLAlchemy-Utils>=0.37
-GeoAlchemy2<0.14.0
-Pillow
-lxml
-packaging
+spatialist>=0.15.1
+sqlalchemy>=1.4,<2.0
+sqlalchemy-utils>=0.37