Skip to content

Commit

Permalink
Remove django-sslserver (mozilla#3359)
Browse files Browse the repository at this point in the history
We don't really use it. The library hasn't been updated in years. The same can be achieved using django-extensions.

Also fix compile_requirements.sh to output requirements .txt files. See:
https://docs.astral.sh/uv/pip/compatibility/#pip-compile-defaults
  • Loading branch information
mathjazz authored Sep 20, 2024
1 parent ef3154c commit 385476a
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 43 deletions.
8 changes: 4 additions & 4 deletions docker/compile_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

export CUSTOM_COMPILE_COMMAND="./docker/compile_requirements.sh"

uv pip compile --generate-hashes $@ requirements/default.in
uv pip compile --generate-hashes $@ requirements/dev.in
uv pip compile --generate-hashes $@ requirements/lint.in
uv pip compile --generate-hashes $@ requirements/test.in
uv pip compile --generate-hashes $@ requirements/default.in -o requirements/default.txt
uv pip compile --generate-hashes $@ requirements/dev.in -o requirements/dev.txt
uv pip compile --generate-hashes $@ requirements/lint.in -o requirements/lint.txt
uv pip compile --generate-hashes $@ requirements/test.in -o requirements/test.txt
2 changes: 0 additions & 2 deletions pontoon/settings/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
"debug_toolbar",
# Adds various commands like e.g. shell which has all models loaded by default.
"django_extensions",
# sslserver helps to develop features that require HTTPS.
"sslserver",
)

# In development, we want to remove the WhiteNoise middleware, because we need
Expand Down
21 changes: 8 additions & 13 deletions requirements/default.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# ./docker/compile_requirements.sh
#
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes requirements/default.in -o requirements/default.txt
amqp==5.2.0 \
--hash=sha256:827cb12fb0baa892aad844fd95258143bce4027fdac4fccddbc43330fd281637 \
--hash=sha256:a1ecff425ad063ad42a486c902807d1482311481c8ad95a72694b2975e75f7fd
Expand Down Expand Up @@ -346,7 +342,7 @@ fluent-syntax==0.19.0 \
--hash=sha256:920326d7f46864b9758f0044e9968e3112198bc826acee16ddd8f11d359004fd \
--hash=sha256:b352b3475fac6c6ed5f06527921f432aac073d764445508ee5218aeccc7cc5c4
# via compare-locales
google-api-core[grpc]==2.18.0 \
google-api-core==2.18.0 \
--hash=sha256:5a63aa102e0049abe85b5b88cb9409234c1f70afcda21ce1e40b285b9629c1d6 \
--hash=sha256:62d97417bfc674d6cef251e5c4d639a9655e00c45528c4364fbfebb478ce72a9
# via
Expand Down Expand Up @@ -950,7 +946,7 @@ pydantic-core==2.16.3 \
--hash=sha256:fc4ad7f7ee1a13d9cb49d8198cd7d7e3aa93e425f371a68235f784e99741561f \
--hash=sha256:fee427241c2d9fb7192b658190f9f5fd6dfe41e02f3c1489d2ec1e6a5ab1e04a
# via pydantic
pyjwt[crypto]==2.4.0 \
pyjwt==2.4.0 \
--hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \
--hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba
# via
Expand Down Expand Up @@ -1213,6 +1209,10 @@ sacrebleu==2.3.1 \
sacremoses==0.0.43 \
--hash=sha256:123c1bf2664351fb05e16f87d3786dbe44a050cfd7b85161c09ad9a63a8e2948
# via -r requirements/default.in
setuptools==75.1.0 \
--hash=sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2 \
--hash=sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538
# via apscheduler
silme @ https://github.com/mozilla/silme/archive/v0.11.2.zip \
--hash=sha256:74a098a9a3b05d0c262e7231225f9200b02342e552eda997d2e8ec07d00d1371
# via -r requirements/default.in
Expand Down Expand Up @@ -1318,8 +1318,3 @@ whitenoise==5.2.0 \
wsgi-sslify==1.0.1 \
--hash=sha256:cde368fda0fb9958dd58bc2cb955d0bf3df1b79c132d97cee90be5fda34a5089
# via -r requirements/default.in

# WARNING: The following packages were not pinned, but pip requires them to be
# pinned when the requirements file includes hashes and the requirement is not
# satisfied by a package already installed. Consider using the --allow-unsafe flag.
# setuptools
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@

django-debug-toolbar==4.3.0
django-extensions==3.2.3
django-sslserver==0.22
12 changes: 2 additions & 10 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# ./docker/compile_requirements.sh
#
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes requirements/dev.in -o requirements/dev.txt
asgiref==3.8.1 \
--hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
--hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
Expand All @@ -17,7 +13,6 @@ django==4.2.11 \
# -c requirements/default.txt
# django-debug-toolbar
# django-extensions
# django-sslserver
django-debug-toolbar==4.3.0 \
--hash=sha256:0b0dddee5ea29b9cb678593bc0d7a6d76b21d7799cb68e091a2148341a80f3c4 \
--hash=sha256:e09b7dcb8417b743234dfc57c95a7c1d1d87a88844abd13b4c5387f807b31bf6
Expand All @@ -26,9 +21,6 @@ django-extensions==3.2.3 \
--hash=sha256:44d27919d04e23b3f40231c4ab7af4e61ce832ef46d610cc650d53e68328410a \
--hash=sha256:9600b7562f79a92cbf1fde6403c04fee314608fefbb595502e34383ae8203401
# via -r requirements/dev.in
django-sslserver==0.22 \
--hash=sha256:c598a363d2ccdc2421c08ddb3d8b0973f80e8e47a3a5b74e4a2896f21c2947c5
# via -r requirements/dev.in
sqlparse==0.4.4 \
--hash=sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3 \
--hash=sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c
Expand Down
8 changes: 2 additions & 6 deletions requirements/lint.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# ./docker/compile_requirements.sh
#
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes requirements/lint.in -o requirements/lint.txt
ruff==0.6.4 \
--hash=sha256:0308610470fcc82969082fc83c76c0d362f562e2f0cdab0586516f03a4e06ec6 \
--hash=sha256:0b52387d3289ccd227b62102c24714ed75fbba0b16ecc69a923a37e3b5e0aaaa \
Expand Down
10 changes: 3 additions & 7 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# ./docker/compile_requirements.sh
#
# This file was autogenerated by uv via the following command:
# uv pip compile --generate-hashes requirements/test.in -o requirements/test.txt
certifi==2024.2.2 \
--hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \
--hash=sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1
Expand Down Expand Up @@ -104,7 +100,7 @@ charset-normalizer==3.3.2 \
# via
# -c requirements/default.txt
# requests
coverage[toml]==7.2.5 \
coverage==7.2.5 \
--hash=sha256:0342a28617e63ad15d96dca0f7ae9479a37b7d8a295f749c14f3436ea59fdcb3 \
--hash=sha256:066b44897c493e0dcbc9e6a6d9f8bbb6607ef82367cf6810d387c09f0cd4fe9a \
--hash=sha256:10b15394c13544fce02382360cab54e51a9e0fd1bd61ae9ce012c0d1e103c813 \
Expand Down

0 comments on commit 385476a

Please sign in to comment.