From 0ab0fb124c6d48be8eaca389c63e1cf0ba07a603 Mon Sep 17 00:00:00 2001 From: Ali Nawaz Date: Mon, 3 Feb 2025 13:03:11 +0500 Subject: [PATCH] fix: use .txt files inside .in files to ensure consistency across environments --- Makefile | 12 +++++++----- requirements/base.in | 2 ++ requirements/base.txt | 0 requirements/constraints.txt | 2 -- requirements/local.in | 5 ++--- requirements/production.in | 2 +- requirements/test.in | 2 ++ requirements/test.txt | 0 8 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 requirements/base.txt create mode 100644 requirements/test.txt diff --git a/Makefile b/Makefile index 20592565ec..59d7f3f2e7 100644 --- a/Makefile +++ b/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 diff --git a/requirements/base.in b/requirements/base.in index e28c73844f..371653a531 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,3 +1,5 @@ +-c constraints.txt + algoliasearch_django backoff beautifulsoup4 diff --git a/requirements/base.txt b/requirements/base.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 11a3de4732..35c5e3bc67 100644 --- a/requirements/constraints.txt +++ b/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 diff --git a/requirements/local.in b/requirements/local.in index b6568b8c02..193e873c97 100644 --- a/requirements/local.in +++ b/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 diff --git a/requirements/production.in b/requirements/production.in index 09ff870897..6f9aab5834 100644 --- a/requirements/production.in +++ b/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 diff --git a/requirements/test.in b/requirements/test.in index 22b0a812dd..8b29e7a37c 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -1,4 +1,6 @@ # Packages required for testing +-c constraints.txt +-r base.txt coverage ddt diff --git a/requirements/test.txt b/requirements/test.txt new file mode 100644 index 0000000000..e69de29bb2