Fix requirements and update workflows

.github/workflows/branch-deploy.yml

@@ -11,14 +11,14 @@ jobs:
       with:
         key: ${{ secrets.DOKKUSD_BRANCH_SSH_PRIVATE_KEY }}
         known_hosts: ${{ vars.DOKKUSD_BRANCH_SSH_KEYSCAN }}
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
     - name: Setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: 3.11
         architecture: x64
     - run: pip install dokkusd
     - uses: oNaiPs/secrets-to-env-action@v1

.github/workflows/branch-destroy.yml

@@ -13,9 +13,9 @@ jobs:
         key: ${{ secrets.DOKKUSD_BRANCH_SSH_PRIVATE_KEY }}
         known_hosts: ${{ vars.DOKKUSD_BRANCH_SSH_KEYSCAN }}
     - name: Setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: 3.11
         architecture: x64
     - run: pip install dokkusd
     - run: python -m dokkusd.cli destroy --appname ${{ vars.DOKKU_BRANCH_APP_NAME_PREFIX }}-${{ github.event.ref }}

.github/workflows/lint.yml

@@ -5,17 +5,11 @@ jobs:
   lint:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
         architecture: x64
-    - uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_dev.txt') }}-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
     - run: pip install -r requirements_dev.txt
     - run: flake8 cove_project/ cove_rdls/

.github/workflows/live-deploy.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Setup python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.11
         architecture: x64
     - run: pip install dokkusd
     - uses: oNaiPs/secrets-to-env-action@v1

requirements.in

@@ -2,8 +2,9 @@ dealer
 sentry-sdk
 Django>3.2,<3.3
 jsonschema
-libcoverdls>=0.1.0
-libcoveweb2>=0.1.0
+git+https://github.com/GFDRR/rdls-lib-cove.git@83d0ac988ef2299768e777a0036e9cde14786db1#egg=libcoverdls
+libcoveweb2>=0.4.0
 gunicorn
 django-bootstrap3
 flattentool
+python-magic

requirements.txt

@@ -8,8 +8,6 @@ amqp==5.1.1
     # via kombu
 asgiref==3.7.2
     # via django
-async-timeout==4.0.2
-    # via redis
 attrs==23.1.0
     # via jsonschema
 backports-datetime-fromisoformat==2.0.0
@@ -61,6 +59,8 @@ et-xmlfile==1.1.0
     # via openpyxl
 flattentool==0.23.0
     # via -r requirements.in
+geojson==3.2.0
+    # via flattentool
 gunicorn==20.1.0
     # via -r requirements.in
 idna==3.4
@@ -70,7 +70,9 @@ ijson==3.2.0.post0
     #   flattentool
     #   libcoverdls
 jsonref==1.1.0
-    # via flattentool
+    # via
+    #   flattentool
+    #   libcoverdls
 jsonschema==4.9.1
     # via
     #   -r requirements.in
@@ -79,14 +81,14 @@ kombu==5.2.4
     # via celery
 libcove2==0.1.0
     # via libcoverdls
--e git+https://github.com/GFDRR/rdls-lib-cove.git#egg=libcoverdls
-#libcoverdls==0.1.0
+libcoverdls @ git+https://github.com/GFDRR/rdls-lib-cove.git@83d0ac988ef2299768e777a0036e9cde14786db1
     # via -r requirements.in
--e git+https://github.com/OpenDataServices/lib-cove-web-2.git#egg=libcoveweb2
-#libcoveweb2==0.2.0
+libcoveweb2==0.4.0
     # via -r requirements.in
 lxml==4.9.2
     # via flattentool
+numpy==2.2.5
+    # via shapely
 odfpy==1.4.1
     # via flattentool
 openpyxl==3.1.2
@@ -106,7 +108,7 @@ pyrsistent==0.19.3
 python-dateutil==2.8.2
     # via libcoverdls
 python-magic==0.4.27
-    # via python-magic
+    # via -r requirements.in
 pytz==2023.3
     # via
     #   celery
@@ -129,6 +131,8 @@ sentry-sdk==1.24.0
     # via
     #   -r requirements.in
     #   libcoveweb2
+shapely==2.1.0
+    # via flattentool
 six==1.16.0
     # via
     #   click-repl

requirements_dev.txt

@@ -16,10 +16,6 @@ async-generator==1.10
     # via
     #   trio
     #   trio-websocket
-async-timeout==4.0.2
-    # via
-    #   -r requirements.txt
-    #   redis
 attrs==23.1.0
     # via
     #   -r requirements.txt
@@ -108,8 +104,12 @@ et-xmlfile==1.1.0
     #   openpyxl
 flake8==6.0.0
     # via -r requirements_dev.in
-flattentool==0.20.1
+flattentool==0.23.0
     # via -r requirements.txt
+geojson==3.2.0
+    # via
+    #   -r requirements.txt
+    #   flattentool
 gunicorn==20.1.0
     # via -r requirements.txt
 h11==0.14.0
@@ -130,6 +130,7 @@ jsonref==1.1.0
     # via
     #   -r requirements.txt
     #   flattentool
+    #   libcoverdls
 jsonschema==4.9.1
     # via
     #   -r requirements.txt
@@ -142,17 +143,20 @@ libcove2==0.1.0
     # via
     #   -r requirements.txt
     #   libcoverdls
--e git+https://github.com/GFDRR/rdls-lib-cove.git#egg=libcoverdls
-#libcoverdls==0.15.0
+libcoverdls @ git+https://github.com/GFDRR/rdls-lib-cove.git@83d0ac988ef2299768e777a0036e9cde14786db1
     # via -r requirements.txt
-libcoveweb2==0.1.0
+libcoveweb2==0.4.0
     # via -r requirements.txt
 lxml==4.9.2
     # via
     #   -r requirements.txt
     #   flattentool
 mccabe==0.7.0
     # via flake8
+numpy==2.2.5
+    # via
+    #   -r requirements.txt
+    #   shapely
 odfpy==1.4.1
     # via
     #   -r requirements.txt
@@ -174,7 +178,7 @@ persistent==5.0
     #   -r requirements.txt
     #   btrees
     #   zodb
-pip-tools==6.12.2
+pip-tools==7.3.0
     # via -r requirements_dev.in
 pluggy==1.0.0
     # via pytest
@@ -210,6 +214,8 @@ python-dateutil==2.8.2
     # via
     #   -r requirements.txt
     #   libcoverdls
+python-magic==0.4.27
+    # via -r requirements.txt
 pytz==2023.3
     # via
     #   -r requirements.txt
@@ -244,6 +250,10 @@ sentry-sdk==1.24.0
     # via
     #   -r requirements.txt
     #   libcoveweb2
+shapely==2.1.0
+    # via
+    #   -r requirements.txt
+    #   flattentool
 six==1.16.0
     # via
     #   -r requirements.txt