Skip to content

Commit

Permalink
fix: use .txt files inside .in files to ensure consistency across env…
Browse files Browse the repository at this point in the history
…ironments (#4556)
  • Loading branch information
zawan-ila authored Feb 7, 2025
1 parent 2e5327a commit 72a9334
Show file tree
Hide file tree
Showing 13 changed files with 2,526 additions and 388 deletions.
1 change: 0 additions & 1 deletion .ci/docker-compose-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ services:
DB_PORT: "3306"
DB_USER: "root"
DJANGO_SETTINGS_MODULE: "course_discovery.settings.test"
ENABLE_DJANGO_TOOLBAR: 1
TEST_ELASTICSEARCH_URL: "http://es:9200"

volumes:
Expand Down
12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
-c constraints.txt

algoliasearch_django
backoff
beautifulsoup4
Expand Down
Loading

0 comments on commit 72a9334

Please sign in to comment.