💩 WRIP

okfde · Nov 27, 2024 · f5c3cf6 · f5c3cf6
1 parent 95100e6
commit f5c3cf6
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
         run: pnpm run build
       - name: Run tests
         run: |
-          coverage run --branch -m pytest froide/
+          pytest --cov froide/  --import-mode=importlib
           coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
         env:
           DATABASE_URL: postgis://postgres:postgres@localhost/froide

diff --git a/pyproject.toml b/pyproject.toml
@@ -80,9 +80,11 @@ test = [
   "pre-commit",
   "pycodestyle",
   "pyflakes",
+  "pytest-cov",
   "pytest-django",
   "pytest-factoryboy",
   "pytest-playwright",
+  "pytest",
   "tblib",
   "text-unidecode",
   "time-machine",

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -13,7 +13,7 @@ asgiref==3.8.1
     #   channels
     #   django
     #   django-stubs
-async-timeout==4.0.3
+async-timeout==4.0.3 ; python_full_version < '3.11'
     # via aiohttp
 attrs==24.2.0
     # via
@@ -26,7 +26,9 @@ billiard==4.2.0
     # via celery
 bleach==6.1.0
     # via froide (pyproject.toml)
-brotli==1.1.0
+brotli==1.1.0 ; platform_python_implementation == 'CPython'
+    # via fonttools
+brotlicffi==1.1.0.0 ; platform_python_implementation != 'CPython'
     # via fonttools
 celery==5.4.0
     # via
@@ -40,6 +42,7 @@ certifi==2024.8.30
     #   requests
 cffi==1.17.1
     # via
+    #   brotlicffi
     #   cryptography
     #   weasyprint
 cfgv==3.4.0
@@ -62,6 +65,11 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
+colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows'
+    # via
+    #   click
+    #   pytest
+    #   qrcode
 coreapi==2.3.3
     # via froide (pyproject.toml)
 coreschema==0.0.4
@@ -70,6 +78,7 @@ coverage==7.6.1
     # via
     #   froide (pyproject.toml)
     #   django-coverage-plugin
+    #   pytest-cov
 cron-descriptor==1.4.5
     # via django-celery-beat
 cryptography==43.0.1
@@ -127,7 +136,7 @@ django-crossdomainmedia==0.0.4
     # via froide (pyproject.toml)
 django-elasticsearch-dsl==8.0
     # via froide (pyproject.toml)
-django-filingcabinet @ git+https://github.com/okfde/django-filingcabinet.git@69cde01cf767ebf6447d057b1400b87c32d03803
+django-filingcabinet @ git+https://github.com/okfde/django-filingcabinet.git@d27b0a823e72cb0e854dd961fdb2cdfa8b417907
     # via froide (pyproject.toml)
 django-filter==24.3
     # via
@@ -193,7 +202,7 @@ elasticsearch-dsl==8.15.2
     # via
     #   froide (pyproject.toml)
     #   django-elasticsearch-dsl
-exceptiongroup==1.2.2
+exceptiongroup==1.2.2 ; python_full_version < '3.11'
     # via pytest
 factory-boy==3.3.1
     # via
@@ -314,7 +323,7 @@ prompt-toolkit==3.0.47
     # via click-repl
 psycopg==3.2.3
     # via froide (pyproject.toml)
-psycopg-binary==3.2.1
+psycopg-binary==3.2.3 ; implementation_name != 'pypy'
     # via psycopg
 pycodestyle==2.12.1
     # via froide (pyproject.toml)
@@ -328,8 +337,6 @@ pyee==11.1.0
     # via playwright
 pyflakes==3.2.0
     # via froide (pyproject.toml)
-pygtail @ git+https://github.com/okfde/pygtail.git@dac8bc6fc8d65c7ac820806e570242919616e946
-    # via froide (pyproject.toml)
 pyisemail==2.0.1
     # via froide (pyproject.toml)
 pyotp==2.9.0
@@ -342,12 +349,16 @@ pyphen==0.16.0
     # via weasyprint
 pytest==8.3.3
     # via
+    #   froide (pyproject.toml)
     #   pytest-base-url
+    #   pytest-cov
     #   pytest-django
     #   pytest-factoryboy
     #   pytest-playwright
 pytest-base-url==2.1.0
     # via pytest-playwright
+pytest-cov==6.0.0
+    # via froide (pyproject.toml)
 pytest-django==4.9.0
     # via froide (pyproject.toml)
 pytest-factoryboy==2.7.0
@@ -429,7 +440,7 @@ tinycss2==1.3.0
     # via
     #   cssselect2
     #   weasyprint
-tomli==2.0.1
+tomli==2.0.1 ; python_full_version <= '3.11'
     # via
     #   coverage
     #   django-stubs
@@ -460,7 +471,10 @@ typing-extensions==4.12.2
 tzdata==2024.1
     # via
     #   celery
+    #   django
     #   django-celery-beat
+    #   kombu
+    #   psycopg
 uritemplate==4.1.1
     # via
     #   coreapi

diff --git a/requirements.txt b/requirements.txt
@@ -12,7 +12,7 @@ asgiref==3.8.1
     # via
     #   channels
     #   django
-async-timeout==4.0.3
+async-timeout==4.0.3 ; python_full_version < '3.11'
     # via aiohttp
 attrs==24.2.0
     # via
@@ -23,7 +23,9 @@ billiard==4.2.0
     # via celery
 bleach==6.1.0
     # via froide (pyproject.toml)
-brotli==1.1.0
+brotli==1.1.0 ; platform_python_implementation == 'CPython'
+    # via fonttools
+brotlicffi==1.1.0.0 ; platform_python_implementation != 'CPython'
     # via fonttools
 celery==5.4.0
     # via
@@ -37,6 +39,7 @@ certifi==2024.8.30
     #   requests
 cffi==1.17.1
     # via
+    #   brotlicffi
     #   cryptography
     #   weasyprint
 channels==4.0.0
@@ -57,6 +60,10 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
+colorama==0.4.6 ; platform_system == 'Windows'
+    # via
+    #   click
+    #   qrcode
 coreapi==2.3.3
     # via froide (pyproject.toml)
 coreschema==0.0.4
@@ -112,7 +119,7 @@ django-crossdomainmedia==0.0.4
     # via froide (pyproject.toml)
 django-elasticsearch-dsl==8.0
     # via froide (pyproject.toml)
-django-filingcabinet @ git+https://github.com/okfde/django-filingcabinet.git@69cde01cf767ebf6447d057b1400b87c32d03803
+django-filingcabinet @ git+https://github.com/okfde/django-filingcabinet.git@d27b0a823e72cb0e854dd961fdb2cdfa8b417907
     # via froide (pyproject.toml)
 django-filter==24.3
     # via
@@ -250,16 +257,14 @@ prompt-toolkit==3.0.47
     # via click-repl
 psycopg==3.2.3
     # via froide (pyproject.toml)
-psycopg-binary==3.2.1
+psycopg-binary==3.2.3 ; implementation_name != 'pypy'
     # via psycopg
 pycparser==2.22
     # via cffi
 pycryptodome==3.20.0
     # via django-filingcabinet
 pydyf==0.11.0
     # via weasyprint
-pygtail @ git+https://github.com/okfde/pygtail.git@dac8bc6fc8d65c7ac820806e570242919616e946
-    # via froide (pyproject.toml)
 pyisemail==2.0.1
     # via froide (pyproject.toml)
 pyotp==2.9.0
@@ -341,7 +346,10 @@ typing-extensions==4.12.2
 tzdata==2024.1
     # via
     #   celery
+    #   django
     #   django-celery-beat
+    #   kombu
+    #   psycopg
 uritemplate==4.1.1
     # via
     #   coreapi