:x

fix login url

3.0

sources

Merge branch 'develop'
tests

.circleci/config.yml

@@ -79,8 +79,7 @@ jobs:
           name: Building the image
           command: |
             docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
-            docker pull unicef/donor-reporting-portal-backend:2.0-base
-#            docker build -t unicef/donor-reporting-portal-backend:${CIRCLE_BRANCH} .
+            docker pull unicef/donor-reporting-portal-backend:3.0-base
       - run:
           name: Pushing to Docker Hub
           command: |

.github/file-filters.yml

@@ -0,0 +1,30 @@
+# This is used by the action https://github.com/dorny/paths-filter
+dependencies: &dependencies
+  - 'uv.lock'
+  - 'pyproject.toml'
+
+python: &python
+  - added|modified: 'src/**'
+  - added|modified: 'tests/**'
+  - 'manage.py'
+
+changelog:
+  - added|modified: 'changes/**'
+  - 'CHANGELOG.md'
+
+mypy:
+  - *python
+  - 'mypy.ini'
+
+run_tests:
+  - *python
+  - *dependencies
+  - 'pytest.ini'
+
+migrations:
+  - added|modified: 'src/**/migrations/*'
+
+lint:
+  -  *python
+  - '.flake8'
+  - 'pyproject.toml'

.github/workflows/test.yml

@@ -0,0 +1,112 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - '**'        # matches every branch
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  id-token: write
+  attestations: write
+
+
+jobs:
+  changes:
+    runs-on: ubuntu-latest
+    concurrency:
+      group: changes-group
+      cancel-in-progress: true
+    timeout-minutes: 1
+    defaults:
+      run:
+        shell: bash
+    outputs:
+      run_tests: ${{steps.changes.outputs.run_tests }}
+      lint: ${{steps.changes.outputs.lint }}
+    steps:
+      - name: Checkout code
+        uses: actions/[email protected]
+      - id: changes
+        name: Check for file changes
+        uses: dorny/[email protected]
+        with:
+          base: ${{ github.ref }}
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+
+  ci:
+    runs-on: ubuntu-latest
+    name: Test py${{ matrix.python-version }}/dj${{matrix.django-version}}
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      max-parallel: 1
+      matrix:
+        python-version: [ "3.13" ]
+        django-version: [ "5.1" ]
+      fail-fast: true
+    needs: [ changes ]
+    if: needs.changes.outputs.run_tests || needs.changes.outputs.lint
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: 'x64'
+
+      - name: Cache virtualenv
+        uses: actions/cache@v4
+        with:
+          key: venv-${{ runner.os }}-${{ steps.setup_python.outputs.python-version}}-${{ hashFiles('uv.lock') }}
+          path: .venv
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Install the project
+        run:  |
+          uv sync --all-extras --dev
+          uv pip install .
+
+      - name: lint
+        if: needs.changes.outputs.lint
+        run: |
+          uv pip install ruff
+          uv run ruff check src tests
+          uv run ruff format --check src tests
+
+      - name: Test
+        if: needs.changes.outputs.run_tests
+        run: |
+          uv run pytest tests --create-db --junit-xml junit-${{ matrix.python-version }}-${{matrix.django-version}}.xml
+
+      - name: Upload pytest test results
+        uses: actions/upload-artifact@v4
+        with:
+          name: pytest-results-${{ matrix.python-version }}-${{matrix.django-version}}
+          path: junit-${{ matrix.python-version }}-${{matrix.django-version}}.xml
+        if: ${{ always() }}
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        if: ${{ always() }}
+        continue-on-error: true
+        with:
+          env_vars: OS,PYTHON
+          fail_ci_if_error: true
+          files: coverage.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: false
+          name: codecov-${{env.GITHUB_REF_NAME}}

.pre-commit-config.yaml

@@ -1,20 +1,13 @@
 repos:
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
     hooks:
-      - id: isort
-        stages: [commit]
-  - repo: https://github.com/ambv/black
-    rev: 23.1.0
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.4
     hooks:
-      - id: black
-        args: [--config=backend/pyproject.toml]
-        exclude: "migrations|snapshots"
-        stages: [commit]
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-        args: [--config=backend/.flake8]
-        additional_dependencies: [flake8-bugbear==22.9.23]
-        stages: [ commit ]
+      - id: ruff
+      - id: ruff-format
+        args:
+          - --check