Makes djangoql only on default django

AngellusMortis · Sep 15, 2022 · e8c2296 · e8c2296
1 parent 7054dab
commit e8c2296
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/.bin/update-requirements b/.bin/update-requirements
@@ -15,12 +15,14 @@ dj_stable="4.1"
 
 for dj_version in "${dj_versions[@]}"; do
     echo "Generating requirements for Django $dj_version..."
+    django_reqs="django~=$dj_stable"
+    extras="--extra=dev"
     if [[ "$dj_version" == "$dj_stable" ]]; then
-        echo -e "django~=$dj_stable\ndjango-constance[database]" > django.in
-    else
-        echo -e "django~=$dj_stable" > django.in
+        django_reqs="django~=$dj_stable\ndjango-constance[database]"
+        extras="--extra=dev --extra=ql"
     fi
-    pip-compile --pip-args='--root-user-action=ignore' -q --extra=dev --extra=ql --upgrade --output-file=reqs/dj$dj_version-requirements.txt pyproject.toml django.in
+    echo -e "$django_reqs" > django.in
+    pip-compile --pip-args='--root-user-action=ignore' -q $extras --upgrade --output-file=reqs/dj$dj_version-requirements.txt pyproject.toml django.in
     rm django.in
 done
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -41,7 +41,6 @@ dev = [
   "bandit",
   "black",
   "coverage",
-  "djangoql",
   "doc8",
   "flake8-bugbear",
   "flake8-builtins",

diff --git a/reqs/dj3.2-requirements.txt b/reqs/dj3.2-requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    pip-compile --extra=dev --extra=ql --output-file=reqs/dj3.2-requirements.txt --pip-args='--root-user-action=ignore' django.in pyproject.toml
+#    pip-compile --extra=dev --output-file=reqs/dj3.2-requirements.txt --pip-args='--root-user-action=ignore' django.in pyproject.toml
 #
 alabaster==0.7.12
     # via sphinx
@@ -50,8 +50,6 @@ django==4.1.1
     # via
     #   -r django.in
     #   django-microsoft-auth (pyproject.toml)
-djangoql==0.17.1
-    # via django-microsoft-auth (pyproject.toml)
 doc8==1.0.0
     # via django-microsoft-auth (pyproject.toml)
 docutils==0.19
@@ -135,8 +133,6 @@ platformdirs==2.5.2
     # via black
 pluggy==1.0.0
     # via pytest
-ply==3.11
-    # via djangoql
 prompt-toolkit==3.0.31
     # via ipython
 ptyprocess==0.7.0

diff --git a/reqs/dj4.0-requirements.txt b/reqs/dj4.0-requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    pip-compile --extra=dev --extra=ql --output-file=reqs/dj4.0-requirements.txt --pip-args='--root-user-action=ignore' django.in pyproject.toml
+#    pip-compile --extra=dev --output-file=reqs/dj4.0-requirements.txt --pip-args='--root-user-action=ignore' django.in pyproject.toml
 #
 alabaster==0.7.12
     # via sphinx
@@ -50,8 +50,6 @@ django==4.1.1
     # via
     #   -r django.in
     #   django-microsoft-auth (pyproject.toml)
-djangoql==0.17.1
-    # via django-microsoft-auth (pyproject.toml)
 doc8==1.0.0
     # via django-microsoft-auth (pyproject.toml)
 docutils==0.19
@@ -135,8 +133,6 @@ platformdirs==2.5.2
     # via black
 pluggy==1.0.0
     # via pytest
-ply==3.11
-    # via djangoql
 prompt-toolkit==3.0.31
     # via ipython
 ptyprocess==0.7.0