maintenance updates

.github/workflows/pypi-publish.yml

@@ -8,22 +8,23 @@ on:
 jobs:
   publish:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.6'
-    - name: Install dependencies
+        python-version: '3.11'
+    - name: Install Poetry
       run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        curl -sSL https://install.python-poetry.org | python3 -
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.pcic_at_pypi_username }}
         TWINE_PASSWORD: ${{ secrets.pcic_at_pypi_password }}
       run: |
-        python setup.py sdist bdist_wheel
-        twine upload --repository-url https://pypi.pacificclimate.org/ --skip-existing -u $TWINE_USERNAME -p $TWINE_PASSWORD dist/*
+        poetry config repositories.pcic https://pypi.pacificclimate.org/
+        poetry config http-basic.pcic $PCIC_PYPI_USERNAME $PCIC_PYPI_PASSWORD
+        poetry build
+        poetry publish -r pcic

.github/workflows/python-ci.yml

@@ -5,13 +5,13 @@ on: push
 jobs:
   test:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         python-version:
-          - "3.8"
-          - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
 
     steps:
     - uses: actions/checkout@v2
@@ -20,37 +20,26 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install dependencies
+    - name: Install system dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install postgis postgresql-14 postgresql-client-14 libhdf5-serial-dev libnetcdf-dev libspatialite-dev
+        sudo apt-get install postgis postgresql-16 postgresql-client-16 libhdf5-serial-dev libnetcdf-dev libspatialite-dev wget
 
-    - name: Install pipenv
+    - name: Install poetry
       run: |
-        pip install pipenv==2022.10.25
-
-    - id: cache-pipenv
-      uses: actions/cache@v2
-      with:
-        path: ~/.local/share/virtualenvs
-        key: ${{ runner.os }}-pipenv-${{ hashFiles('**/Pipfile.lock') }}
+        wget -O - https://install.python-poetry.org | python3 -
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
 
-    - name: Install dependencies if changed
-      if: ${{ steps.cache-pipenv.outputs.cache-hit != 'true' && matrix.python-version == '3.8' }}
-      run: |
-        pipenv install --deploy --dev
-    - name: Re-install dependencies if alternative python version
-      if: ${{ matrix.python-version != '3.8' }}
+    - name: Install python dependencies
       run: |
-        mv Pipfile.lock do-not-use
-        pipenv install --python ${{ matrix.python-version }} --dev
+        poetry install --extras test
 
     - name: Test with pytest (full)
       if: github.ref == 'refs/heads/master'
       run: |
-        pipenv run py.test -m "not online" -v
+        poetry run py.test -v
 
     - name: Test with pytest (fast)
       if: github.ref != 'refs/heads/master'
       run: |
-        pipenv run py.test -m "not online and not slow" -v
+        poetry run py.test -m "not slow" -v

Makefile

@@ -1,17 +1,16 @@
-all: install install-pipenv test
+all: install install-poetry test
 
 install:
-	sudo apt-get install postgresql-14 \
-		postgresql-client-14 \
+	sudo apt-get install postgresql-16 \
+		postgresql-client-16 \
 		libhdf5-serial-dev \
 		libnetcdf-dev \
 		libspatialite-dev \
-		postgresql-14-postgis-3
+		postgresql-16-postgis-3
 
-install-pipenv:
-	sudo apt-get install pipenv
-	pipenv install
-	pipenv install --dev
+install-poetry:
+	pip install poetry
+	poetry install --extras test 
 
-test: install
-	pipenv run pytest -v
+test:
+	poetry run pytest -v