👷

Author: stevenbal

.github/workflows/ci.yml

@@ -89,28 +89,47 @@ jobs:
 
   benchmarks:
     name: Run benchmarks
-    runs-on: ubuntu-latest
+    runs-on: codspeed-macro
+
+    services:
+      postgres:
+        image: postgis/postgis:17-3.5
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
     steps:
       - uses: actions/checkout@v4
-      - name: Bring up docker compose and load data
-        run: |
-          docker compose up -d --build || ( docker compose logs >&2 && exit 1; )
-          until docker compose logs web | grep -q "spawned uWSGI worker"; do
-            echo "uWSGI not running yet, waiting..."
-            sleep 3
-          done
-          docker compose exec --user root web pip install factory-boy
-          cat performance_test/create_data.py | docker compose exec -T web src/manage.py shell
-
-      - name: Install dependencies
-        run: |
-          pip install -r requirements/ci.txt
+      # - name: Bring up docker compose and load data
+      #   run: |
+      #     docker compose up -d --build || ( docker compose logs >&2 && exit 1; )
+      #     until docker compose logs web | grep -q "spawned uWSGI worker"; do
+      #       echo "uWSGI not running yet, waiting..."
+      #       sleep 3
+      #     done
+      #     docker compose exec --user root web pip install factory-boy
+      #     cat performance_test/create_data.py | docker compose exec -T web src/manage.py shell
+
+      - name: Set up backend environment
+        uses: maykinmedia/[email protected]
+        with:
+          apt-packages: 'libgdal-dev gdal-bin'
+          python-version: '3.11'
+          setup-node: true
 
       - name: Run benchmarks
-        uses: CodSpeedHQ/action@v3
+        uses: CodSpeedHQ/action@v3.5.0
         with:
           token: ${{ secrets.CODSPEED_TOKEN }}
           run: "pytest performance_test/ --codspeed"
+        env:
+          DJANGO_SETTINGS_MODULE: objects.conf.ci
+          SECRET_KEY: dummy
+          DB_USER: postgres
+          DB_PASSWORD: ''
 
   docs:
     runs-on: ubuntu-latest

performance_test/conftest.py

@@ -0,0 +1,24 @@
+import pytest
+
+from objects.core.tests.factories import ObjectRecordFactory, ObjectTypeFactory
+from objects.token.tests.factories import TokenAuthFactory
+
+
+@pytest.fixture(scope="session")
+def setup(django_db_setup, django_db_blocker):
+    print("setup")
+    with django_db_blocker.unblock():
+        object_type = ObjectTypeFactory.create(
+            service__api_root="http://localhost:8001/api/v2/",
+            uuid="f1220670-8ab7-44f1-a318-bd0782e97662",
+        )
+
+        TokenAuthFactory(token="secret", is_superuser=True)
+
+        ObjectRecordFactory.create_batch(
+            5000,
+            object__object_type=object_type,
+            start_at="2020-01-01",
+            version=1,
+            data={"kiemjaar": "1234"},
+        )

performance_test/test_objects_list.py

@@ -1,11 +1,12 @@
-import requests
+import pytest
 from furl import furl
 
 BASE_URL = furl("http://localhost:8000/api/v2/")
 AUTH_HEADERS = {"Authorization": "Token secret"}
 
 
-def test_objects_api_list(benchmark):
+@pytest.mark.django_db
+def test_objects_api_list(benchmark, client, setup):
     """
     Regression test for maykinmedia/objects-api#538
     """
@@ -17,9 +18,9 @@ def test_objects_api_list(benchmark):
     }
 
     def make_request():
-        return requests.get((BASE_URL / "objects").set(params), headers=AUTH_HEADERS)
+        return client.get((BASE_URL / "objects").set(params), headers=AUTH_HEADERS)
 
-    result = benchmark(make_request)
+    response = benchmark(make_request)
 
-    assert result.status_code == 200
-    assert result.json()["count"] == 5000
+    assert response.status_code == 200
+    assert response.json()["count"] == 5000

requirements/base.txt

@@ -41,7 +41,7 @@ certifi==2024.7.4
     #   elastic-apm
     #   requests
     #   sentry-sdk
-cffi==1.16.0
+cffi==1.17.1
     # via cryptography
 charset-normalizer==3.3.2
     # via requests

requirements/ci.txt

@@ -79,7 +79,7 @@ certifi==2024.7.4
     #   elastic-apm
     #   requests
     #   sentry-sdk
-cffi==1.16.0
+cffi==1.17.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -461,6 +461,8 @@ kombu==5.4.2
     #   celery
 lxml==4.9.4
     # via pyquery
+markdown-it-py==3.0.0
+    # via rich
 markupsafe==2.1.3
     # via
     #   -c requirements/base.txt
@@ -473,6 +475,8 @@ maykin-2fa==1.0.1
     #   open-api-framework
 mccabe==0.7.0
     # via flake8
+mdurl==0.1.2
+    # via markdown-it-py
 mozilla-django-oidc==4.0.0
     # via
     #   -c requirements/base.txt
@@ -564,6 +568,7 @@ pyflakes==3.2.0
     # via flake8
 pygments==2.18.0
     # via
+    #   rich
     #   sphinx
     #   sphinx-tabs
 pyjwt==2.4.0
@@ -590,7 +595,10 @@ pytest==8.3.3
     # via
     #   -r requirements/test-tools.in
     #   pytest-codspeed
-pytest-codspeed==2.2.1
+    #   pytest-django
+pytest-codspeed==3.0.0
+    # via -r requirements/test-tools.in
+pytest-django==4.10.0
     # via -r requirements/test-tools.in
 python-dateutil==2.9.0.post0
     # via
@@ -656,6 +664,8 @@ requests-mock==1.12.1
     #   -r requirements/base.txt
     #   -r requirements/test-tools.in
     #   commonground-api-common
+rich==13.9.4
+    # via pytest-codspeed
 ruamel-yaml==0.18.10
     # via
     #   -c requirements/base.txt

requirements/dev.txt

@@ -102,7 +102,7 @@ certifi==2024.7.4
     #   httpx
     #   requests
     #   sentry-sdk
-cffi==1.16.0
+cffi==1.17.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -541,7 +541,10 @@ lxml==4.9.4
     #   -r requirements/ci.txt
     #   pyquery
 markdown-it-py==3.0.0
-    # via rich
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   rich
 markupsafe==2.1.3
     # via
     #   -c requirements/ci.txt
@@ -558,7 +561,10 @@ mccabe==0.7.0
     #   -r requirements/ci.txt
     #   flake8
 mdurl==0.1.2
-    # via markdown-it-py
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+    #   markdown-it-py
 mozilla-django-oidc==4.0.0
     # via
     #   -c requirements/ci.txt
@@ -718,7 +724,12 @@ pytest==8.3.3
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   pytest-codspeed
-pytest-codspeed==2.2.1
+    #   pytest-django
+pytest-codspeed==3.0.0
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
+pytest-django==4.10.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -792,7 +803,10 @@ requests-mock==1.12.1
     #   commonground-api-common
 rich==13.9.4
     # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
     #   bump-my-version
+    #   pytest-codspeed
     #   rich-click
 rich-click==1.8.5
     # via bump-my-version

requirements/test-tools.in

@@ -4,6 +4,7 @@
 # Dependencies only relevant for (unit) testing
 codecov
 pytest
+pytest-django
 pytest-codspeed
 coverage < 5.0
 django-webtest

setup.cfg

@@ -14,3 +14,7 @@ skip_glob = **/migrations/**
 known_django=django
 known_first_party=objects
 sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+
+[tool:pytest]
+DJANGO_SETTINGS_MODULE = objects.conf.ci
+pythonpath = . src