fix: use .txt files inside .in files to ensure consistency across env…

…ironments

Makefile

@@ -56,13 +56,15 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
 	sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
 	mv requirements/common_constraints.tmp requirements/common_constraints.txt
 	pip install -q -r requirements/pip_tools.txt
-	pip-compile --allow-unsafe --upgrade -o requirements/pip.txt requirements/pip.in
-	pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
+	pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
+	pip-compile --rebuild --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
 	pip install -q -r requirements/pip.txt
 	pip install -q -r requirements/pip_tools.txt
-	pip-compile --upgrade -o requirements/docs.txt requirements/docs.in
-	pip-compile --upgrade -o requirements/local.txt requirements/local.in
-	pip-compile --upgrade -o requirements/production.txt requirements/production.in
+	pip-compile --rebuild --upgrade -o requirements/base.txt requirements/base.in
+	pip-compile --rebuild --upgrade -o requirements/docs.txt requirements/docs.in
+	pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in
+	pip-compile --rebuild --upgrade -o requirements/local.txt requirements/local.in
+	pip-compile --rebuild --upgrade -o requirements/production.txt requirements/production.in
 	# Let tox control the Django version for tests
 	grep -e "^django==" requirements/local.txt > requirements/django.txt
 	sed -i.tmp '/^[dD]jango==/d' requirements/local.txt

requirements/base.in

@@ -1,3 +1,5 @@
+-c constraints.txt
+
 algoliasearch_django
 backoff
 beautifulsoup4

requirements/constraints.txt

@@ -27,8 +27,6 @@ authlib==1.0.0rc1
 # Remove this pin after fixing them.
 django-stdimage<=5.3.0
 
-semgrep==0.102.0
-
 # Pinning sphinx as new major release is causing error while installing requirements.
 sphinx<6.0.0
 

requirements/local.in

@@ -1,9 +1,8 @@
 # Packages required for local development
 -c constraints.txt
 -r github.in              # Forks and other dependencies not yet on PyPI
--r base.in
--r test.in
--r docs.in
+-r test.txt
+-r docs.txt
 
 django-debug-toolbar
 django-elasticsearch-debug-toolbar

requirements/production.in

@@ -1,7 +1,7 @@
 # Packages required in a production environment
 -c constraints.txt
 -r github.in              # Forks and other dependencies not yet on PyPI
--r base.in
+-r base.txt
 
 certifi
 django-ses

requirements/test.in

@@ -1,4 +1,6 @@
 # Packages required for testing
+-c constraints.txt
+-r base.txt
 
 coverage
 ddt