Skip to content

Commit 72a9334

Browse files
authored
fix: use .txt files inside .in files to ensure consistency across environments (#4556)
1 parent 2e5327a commit 72a9334

File tree

13 files changed

+2526
-388
lines changed

13 files changed

+2526
-388
lines changed

.ci/docker-compose-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ services:
5858
DB_PORT: "3306"
5959
DB_USER: "root"
6060
DJANGO_SETTINGS_MODULE: "course_discovery.settings.test"
61-
ENABLE_DJANGO_TOOLBAR: 1
6261
TEST_ELASTICSEARCH_URL: "http://es:9200"
6362

6463
volumes:

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,15 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
5656
sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
5757
mv requirements/common_constraints.tmp requirements/common_constraints.txt
5858
pip install -q -r requirements/pip_tools.txt
59-
pip-compile --allow-unsafe --upgrade -o requirements/pip.txt requirements/pip.in
60-
pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
59+
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
60+
pip-compile --rebuild --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
6161
pip install -q -r requirements/pip.txt
6262
pip install -q -r requirements/pip_tools.txt
63-
pip-compile --upgrade -o requirements/docs.txt requirements/docs.in
64-
pip-compile --upgrade -o requirements/local.txt requirements/local.in
65-
pip-compile --upgrade -o requirements/production.txt requirements/production.in
63+
pip-compile --rebuild --upgrade -o requirements/base.txt requirements/base.in
64+
pip-compile --rebuild --upgrade -o requirements/docs.txt requirements/docs.in
65+
pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in
66+
pip-compile --rebuild --upgrade -o requirements/local.txt requirements/local.in
67+
pip-compile --rebuild --upgrade -o requirements/production.txt requirements/production.in
6668
# Let tox control the Django version for tests
6769
grep -e "^django==" requirements/local.txt > requirements/django.txt
6870
sed -i.tmp '/^[dD]jango==/d' requirements/local.txt

requirements/base.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
-c constraints.txt
2+
13
algoliasearch_django
24
backoff
35
beautifulsoup4

0 commit comments

Comments
 (0)