From 7f1c5439383fd0d0d0515287e6971d1d21578355 Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Wed, 12 Apr 2023 13:40:44 -0700 Subject: [PATCH] Revert "Bump django from 4.0.10 to 4.2 in /requirements (#7684)" (#7688) This reverts commit 1a3599a0a0ec081aacdcb1b4839794fd0fff6856. --- requirements/common.in | 4 ++-- requirements/common.txt | 38 +++++++++++--------------------------- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/requirements/common.in b/requirements/common.in index 85aa3b0d0..852f3cdc4 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -1,7 +1,7 @@ # Packages that are shared between deployment and dev environments. gunicorn==20.0.4 whitenoise[brotli] # Used by Whitenoise to provide Brotli-compressed versions of static files. -Django==4.2 +Django==4.0.10 celery==5.2.6 # celery needed for data ingestion cached-property==1.5.2 # needed for kombu with --require-hashes simplejson # import simplejson @@ -11,7 +11,7 @@ certifi==2022.12.7 mysqlclient # Required by Django jsonschema # import jsonschema -djangorestframework==3.14.0 # Imported as rest_framework +djangorestframework # Imported as rest_framework django-cors-headers # Listed as 3rd party app on settings.py mozlog diff --git a/requirements/common.txt b/requirements/common.txt index 2b36c7dff..db6f1c926 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.9 # To update, run: # -# pip-compile --generate-hashes --output-file=common.txt common.in +# pip-compile --generate-hashes --output-file=requirements/common.txt requirements/common.in # aiohttp==3.7.4.post0 \ --hash=sha256:02f46fc0e3c5ac58b80d4d56eb0a7c7d97fcef69ace9326289fb9f1955e65cfe \ @@ -51,9 +51,9 @@ appdirs==1.4.4 \ --hash=sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 \ --hash=sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128 # via mozci -asgiref==3.6.0 \ - --hash=sha256:71e68008da809b957b7ee4b43dbccff33d1b23519fb8344e33f049897077afac \ - --hash=sha256:9567dfe7bd8d3c8c892227827c41cce860b368104c3431da67a0c5a65a949506 +asgiref==3.5.0 \ + --hash=sha256:2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0 \ + --hash=sha256:88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9 # via django async-timeout==3.0.1 \ --hash=sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f \ @@ -196,12 +196,6 @@ click-repl==0.2.0 \ --hash=sha256:94b3fbbc9406a236f176e0506524b2937e4b23b6f4c0c0b2a0a83f8a64e9194b \ --hash=sha256:cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8 # via celery -colorama==0.4.6 \ - --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ - --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 - # via - # click - # loguru coreapi==2.3.3 \ --hash=sha256:46145fcc1f7017c076a2ef684969b641d18a2991051fddec9458ad3f78ffc1cb \ --hash=sha256:bf39d118d6d3e171f10df9ede5666f63ad80bba9a29a8ec17726a66cf52ee6f3 @@ -210,9 +204,9 @@ coreschema==0.0.4 \ --hash=sha256:5e6ef7bf38c1525d5e55a895934ab4273548629f16aed5c0a6caa74ebf45551f \ --hash=sha256:9503506007d482ab0867ba14724b93c18a33b22b6d19fb419ef2d239dd4a1607 # via coreapi -django==4.2 \ - --hash=sha256:ad33ed68db9398f5dfb33282704925bce044bef4261cd4fb59e4e7f9ae505a78 \ - --hash=sha256:c36e2ab12824e2ac36afa8b2515a70c53c7742f0d6eaefa7311ec379558db997 +django==4.0.10 \ + --hash=sha256:2c2f73c16b11cb272c6d5e3b063f0d1be06f378d8dc6005fbe8542565db659cc \ + --hash=sha256:4496eb4f65071578b703fdc6e6f29302553c7440e3f77baf4cefa4a4e091fc3d # via # -r common.in # django-cors-headers @@ -239,9 +233,9 @@ django-redis==4.12.1 \ --hash=sha256:1133b26b75baa3664164c3f44b9d5d133d1b8de45d94d79f38d1adc5b1d502e5 \ --hash=sha256:306589c7021e6468b2656edc89f62b8ba67e8d5a1c8877e2688042263daa7a63 # via -r common.in -djangorestframework==3.14.0 \ - --hash=sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8 \ - --hash=sha256:eb63f58c9f218e1a7d064d17a70751f528ed4e1d35547fdade9aaf4cd103fd08 +djangorestframework==3.12.2 \ + --hash=sha256:0209bafcb7b5010fdfec784034f059d512256424de2a0f084cb82b096d6dd6a7 \ + --hash=sha256:0898182b4737a7b584a2c73735d89816343369f259fea932d90dc78e35d8ac33 # via -r common.in dockerflow==2022.7.0 \ --hash=sha256:6b15c6904198095225c167abb4e1b3547220cd1faccd786b92f314e46bbecc7c \ @@ -549,9 +543,7 @@ python3-memcached==1.51 \ pytz==2022.1 \ --hash=sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7 \ --hash=sha256:e68985985296d9a66a881eb3193b0906246245294a881e7c8afe623866ac6a5c - # via - # celery - # djangorestframework + # via celery pyyaml==5.4.1 \ --hash=sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf \ --hash=sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696 \ @@ -752,10 +744,6 @@ typing-extensions==4.1.1 \ --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \ --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2 # via aiohttp -tzdata==2023.3 \ - --hash=sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a \ - --hash=sha256:7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda - # via django uritemplate==3.0.1 \ --hash=sha256:07620c3f3f8eed1f12600845892b0e036a2420acf513c53f7de0abd911a5894f \ --hash=sha256:5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae @@ -785,10 +773,6 @@ whitenoise[brotli]==5.2.0 \ --hash=sha256:05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7 \ --hash=sha256:05d00198c777028d72d8b0bbd234db605ef6d60e9410125124002518a48e515d # via -r common.in -win32-setctime==1.1.0 \ - --hash=sha256:15cf5750465118d6929ae4de4eb46e8edae9a5634350c01ba582df868e932cb2 \ - --hash=sha256:231db239e959c2fe7eb1d7dc129f11172354f98361c4fa2d6d2d7e278baa8aad - # via loguru yarl==1.6.3 \ --hash=sha256:00d7ad91b6583602eb9c1d085a2cf281ada267e9a197e8b7cae487dadbfa293e \ --hash=sha256:0355a701b3998dcd832d0dc47cc5dedf3874f966ac7f870e0f3a6788d802d434 \