[#13] update requirements structure

bin/compile_dependencies.bat

@@ -16,12 +16,14 @@ pip-compile^
     --output-file requirements/ci.txt^
     %*^
     requirements/base.txt^
-    requirements/test-tools.in
+    requirements/test-tools.in^
+    requirements/ci.in
 
-REM Dev depedencies - exact same set as CI + some extra tooling
+REM Dev depedencies
 pip-compile^
     --no-emit-index-url^
     --output-file requirements/dev.txt^
     %*^
-    requirements/ci.txt^
+    requirements/base.txt^
+    requirements/test-tools.in^
     requirements/dev.in

bin/compile_dependencies.sh

@@ -31,12 +31,14 @@ pip-compile \
     --output-file requirements/ci.txt \
     "$@" \
     requirements/base.txt \
-    requirements/test-tools.in
+    requirements/test-tools.in \
+    requirements/ci.in
 
-# Dev depedencies - exact same set as CI + some extra tooling
+# Dev depedencies
 pip-compile \
     --no-emit-index-url \
     --output-file requirements/dev.txt \
     "$@" \
-    requirements/ci.txt \
+    requirements/base.txt \
+    requirements/test-tools.in \
     requirements/dev.in

requirements/base.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --no-emit-index-url requirements/base.in
@@ -315,7 +315,9 @@ sqlparse==0.5.0
 tornado==6.4.1
     # via flower
 typing-extensions==4.9.0
-    # via mozilla-django-oidc-db
+    # via
+    #   asgiref
+    #   mozilla-django-oidc-db
 tzdata==2024.1
     # via celery
 uritemplate==3.0.1

requirements/ci.in

@@ -0,0 +1,2 @@
+codecov
+pytest

requirements/ci.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --no-emit-index-url --output-file=requirements/ci.txt requirements/base.txt requirements/test-tools.in
+#    pip-compile --no-emit-index-url --output-file=requirements/ci.txt requirements/base.txt requirements/ci.in requirements/test-tools.in
 #
 amqp==5.2.0
     # via
@@ -33,6 +33,8 @@ billiard==4.2.0
     # via
     #   -r requirements/base.txt
     #   celery
+black==24.8.0
+    # via -r requirements/test-tools.in
 bleach==6.1.0
     # via
     #   -r requirements/base.txt
@@ -70,6 +72,7 @@ charset-normalizer==3.3.2
 click==8.1.7
     # via
     #   -r requirements/base.txt
+    #   black
     #   celery
     #   click-didyoumean
     #   click-plugins
@@ -86,6 +89,8 @@ click-repl==0.3.0
     # via
     #   -r requirements/base.txt
     #   celery
+codecov==2.1.13
+    # via -r requirements/ci.in
 commonground-api-common==1.13.0
     # via
     #   -r requirements/base.txt
@@ -99,7 +104,9 @@ coreschema==0.0.4
     #   -r requirements/base.txt
     #   coreapi
 coverage==4.5.4
-    # via -r requirements/test-tools.in
+    # via
+    #   -r requirements/test-tools.in
+    #   codecov
 cryptography==42.0.4
     # via
     #   -r requirements/base.txt
@@ -287,6 +294,8 @@ elastic-apm==6.23.0
     # via
     #   -r requirements/base.txt
     #   open-api-framework
+exceptiongroup==1.2.2
+    # via pytest
 face==20.1.1
     # via
     #   -r requirements/base.txt
@@ -295,6 +304,8 @@ factory-boy==3.2.0
     # via -r requirements/test-tools.in
 faker==8.1.0
     # via factory-boy
+flake8==7.1.1
+    # via -r requirements/test-tools.in
 flower==2.0.1
     # via
     #   -r requirements/base.txt
@@ -329,6 +340,8 @@ inflection==0.5.1
     #   -r requirements/base.txt
     #   drf-spectacular
     #   drf-yasg
+iniconfig==2.0.0
+    # via pytest
 iso-639==0.4.5
     # via
     #   -r requirements/base.txt
@@ -337,6 +350,8 @@ isodate==0.6.0
     # via
     #   -r requirements/base.txt
     #   commonground-api-common
+isort==5.13.2
+    # via -r requirements/test-tools.in
 itypes==1.2.0
     # via
     #   -r requirements/base.txt
@@ -367,6 +382,8 @@ maykin-2fa==1.0.1
     # via
     #   -r requirements/base.txt
     #   open-api-framework
+mccabe==0.7.0
+    # via flake8
 mozilla-django-oidc==4.0.0
     # via
     #   -r requirements/base.txt
@@ -377,6 +394,8 @@ mozilla-django-oidc-db==0.19.0
     #   open-api-framework
 multidict==6.0.5
     # via yarl
+mypy-extensions==1.0.0
+    # via black
 notifications-api-common==0.2.2
     # via
     #   -r requirements/base.txt
@@ -394,11 +413,19 @@ oyaml==1.0
 packaging==23.2
     # via
     #   -r requirements/base.txt
+    #   black
     #   drf-yasg
+    #   pytest
+pathspec==0.12.1
+    # via black
 phonenumberslite==8.13.30
     # via
     #   -r requirements/base.txt
     #   django-two-factor-auth
+platformdirs==4.3.3
+    # via black
+pluggy==1.5.0
+    # via pytest
 prometheus-client==0.20.0
     # via
     #   -r requirements/base.txt
@@ -411,10 +438,14 @@ psycopg2==2.9.9
     # via
     #   -r requirements/base.txt
     #   open-api-framework
+pycodestyle==2.12.1
+    # via flake8
 pycparser==2.20
     # via
     #   -r requirements/base.txt
     #   cffi
+pyflakes==3.2.0
+    # via flake8
 pyjwt==2.4.0
     # via
     #   -r requirements/base.txt
@@ -433,6 +464,8 @@ pyrsistent==0.17.3
     # via
     #   -r requirements/base.txt
     #   jsonschema
+pytest==8.3.3
+    # via -r requirements/ci.in
 python-dateutil==2.9.0.post0
     # via
     #   -r requirements/base.txt
@@ -473,6 +506,7 @@ requests==2.32.3
     # via
     #   -r requirements/base.txt
     #   ape-pie
+    #   codecov
     #   commonground-api-common
     #   coreapi
     #   django-log-outgoing-requests
@@ -508,13 +542,19 @@ tblib==1.7.0
     # via -r requirements/test-tools.in
 text-unidecode==1.3
     # via faker
+tomli==2.0.1
+    # via
+    #   black
+    #   pytest
 tornado==6.4.1
     # via
     #   -r requirements/base.txt
     #   flower
 typing-extensions==4.9.0
     # via
     #   -r requirements/base.txt
+    #   asgiref
+    #   black
     #   mozilla-django-oidc-db
 tzdata==2024.1
     # via

requirements/dev.in

@@ -2,11 +2,6 @@
 pip-tools
 bumpversion
 
-# Code formatting
-black
-isort
-flake8
-
 # Debug tooling
 django-debug-toolbar
 django-extensions