Merge pull request #2246 from coronasafe/develop

Merge Develop to Staging v24.24.0

.github/workflows/deployment.yaml → .github/workflows/deploy.yml

@@ -33,7 +33,7 @@ env:
 
 jobs:
   test:
-    uses: ./.github/workflows/test-base.yml
+    uses: ./.github/workflows/reusable-test.yml
 
   build:
     needs: test

.github/workflows/docs.yml

@@ -19,14 +19,12 @@ jobs:
     name: Build docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: 'pipenv'
-          cache-dependency-path: |
-            Pipfile.lock
 
       - name: Install pipenv
         run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
@@ -53,7 +51,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download sphinx documentation
         uses: actions/download-artifact@v3
@@ -66,7 +64,7 @@ jobs:
           touch build/.nojekyll
 
       - name: Deploy docs
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: gh-pages
           folder: build

.github/workflows/linter.yml

@@ -7,9 +7,10 @@ on:
       - staging
   merge_group:
 
+permissions: { }
+
 jobs:
   build:
-    if: github.repository == 'coronasafe/care'
     name: Lint Code Base
     runs-on: ubuntu-latest
     permissions:
@@ -19,14 +20,13 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter/slim@v5
+        uses: super-linter/super-linter/slim@v6
         env:
-          DEFAULT_BRANCH: develop
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_PYTHON_BLACK: true

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     name: Release on Push
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Necessary to fetch all tags
 

.github/workflows/test-base.yml → .github/workflows/reusable-test.yml

@@ -50,7 +50,9 @@ jobs:
         run: make test-coverage
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Move cache
         run: |

.github/workflows/test-merge-queue.yml

@@ -5,4 +5,4 @@ on:
 
 jobs:
   test:
-    uses: ./.github/workflows/test-base.yml
+    uses: ./.github/workflows/reusable-test.yml

.github/workflows/tests.yml → .github/workflows/test-pull-request.yml

@@ -9,4 +9,4 @@ concurrency:
 
 jobs:
   test:
-    uses: ./.github/workflows/test-base.yml
+    uses: ./.github/workflows/reusable-test.yml

.pre-commit-config.yaml

@@ -17,13 +17,13 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         additional_dependencies: ["isort[pyproject]"]
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.4.0
     hooks:
       - id: black
         args: ["--config=pyproject.toml"]

Pipfile

@@ -6,73 +6,73 @@ name = "pypi"
 [packages]
 argon2-cffi = "==23.1.0"
 authlib = "==1.3.0"
-boto3 = "==1.34.84"
-celery = "==5.3.6"
+boto3 = "==1.34.117"
+celery = "==5.4.0"
 django = "==4.2.10"
 django-environ = "==0.11.2"
-django-cors-headers = "==4.2.0"
-django-filter = "==23.2"
+django-cors-headers = "==4.3.1"
+django-filter = "==24.2"
 django-hardcopy = "==0.1.4"
-django-maintenance-mode = "==0.21.0"
-django-model-utils = "==4.3.1"
+django-maintenance-mode = "==0.21.1"
+django-model-utils = "==4.5.1"
 django-multiselectfield = "==0.1.12"
 django-queryset-csv = "==1.1.0"
 django-ratelimit = "==4.1.0"
-django-redis = "==5.3.0"
-django-rest-passwordreset = "==1.3.0"
-django-simple-history = "==3.3.0"
-djangoql = "==0.17.1"
-djangorestframework = "==3.14.0"
+django-redis = "==5.4.0"
+django-rest-passwordreset = "==1.4.1"
+django-simple-history = "==3.7.0"
+djangoql = "==0.18.1"
+djangorestframework = "==3.15.1"
 djangorestframework-simplejwt = "==5.3.1"
 dry-rest-permissions = "==0.1.10"
 drf-nested-routers = "==0.94.1"
-drf-spectacular = "==0.26.4"
+drf-spectacular = "==0.27.2"
 "fhir.resources" = "==6.5.0"
 gunicorn = "==22.0.0"
 healthy-django = "==0.1.0"
-jsonschema = "==4.20.0"
+jsonschema = "==4.22.0"
 jwcrypto = "==1.5.6"
-newrelic = "==9.3.0"
+newrelic = "==9.10.0"
 pillow = "==10.3.0"
-psycopg = "==3.1.18"
+psycopg = { extras = ["c"], version = "==3.1.19" }
 pycryptodome = "==3.20.0"
 pydantic = "==1.10.15" # fix for fhir.resources < 7.0.2
 pyjwt = "==2.8.0"
-python-slugify = "==8.0.1"
+python-slugify = "==8.0.4"
 pywebpush = "==1.14.0"
-redis = {extras = ["hiredis"], version = "<5.0.0"} # constraint for redis-om
+redis = { extras = ["hiredis"], version = "==5.0.3" } # constraint for redis-om
 redis-om = "==0.3.1"
-requests = "==2.31.0"
-sentry-sdk = "==1.30.0"
+requests = "==2.32.3"
+sentry-sdk = "==2.3.1"
 whitenoise = "==6.6.0"
 
 [dev-packages]
 black = "==24.4.2"
-boto3-stubs = {extras = ["s3", "boto3"], version = "==1.34.84"}
-coverage = "==7.4.0"
+boto3-stubs = { extras = ["s3", "boto3"], version = "==1.34.117" }
+coverage = "==7.5.3"
 debugpy = "==1.8.1"
 django-coverage-plugin = "==3.1.0"
-django-debug-toolbar = "==4.3.0"
+django-debug-toolbar = "==4.4.2"
 django-extensions = "==3.2.3"
-django-silk = "==5.0.3"
-django-stubs = "==4.2.4"
-djangorestframework-stubs = "==3.14.2"
+django-silk = "==5.1.0"
+django-stubs = "==5.0.2"
+djangorestframework-stubs = "==3.15.0"
 factory-boy = "==3.3.0"
 flake8 = "==7.0.0"
-freezegun = "==1.2.2"
-ipython = "==8.24.0"
-isort = "==5.12.0"
-mypy = "==1.9.0"
-pre-commit = "==3.4.0"
+freezegun = "==1.5.1"
+ipython = "==8.25.0"
+isort = "==5.13.2"
+mypy = "==1.10.0"
+pre-commit = "==3.7.1"
 requests-mock = "==1.12.1"
-tblib = "==2.0.0"
-watchdog = "==3.0.0"
+tblib = "==3.0.0"
+watchdog = "==4.0.1"
 werkzeug = "==3.0.3"
 
 [docs]
-furo = "==2023.9.10"
-sphinx = "==7.2.6"
-myst-parser = "==2.0.0"
+furo = "==2024.5.6"
+sphinx = "==7.3.7"
+myst-parser = "==3.0.1"
 
 [requires]
 python_version = "3.11"