From ef28c454046bd47a79854be4f5ac0899583030fa Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 00:12:49 -0800 Subject: [PATCH 1/9] Undo version bump Reverts a portion of f0567ed (PR #10 ), which we'd previously rolled back due to some unsupported features but inadvertently remerged recently --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 82b0c92c50..b3cd26e887 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11 +FROM python:3.9 ENV PYTHONUNBUFFERED 1 From 003531b42fd6fa6217182b38f948ab024f801be9 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 00:16:20 -0800 Subject: [PATCH 2/9] Revert Pytest version bump Only reverting the Python version bump wasn't sufficient, I'm going to try Pytest next. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ae8c88da5f..e28323bd2d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,7 +39,7 @@ tornado==6.3.3 # Dev pytest-django==4.1.0 -pytest==6.2.5 +pytest==6.1.2 pytest-cov==2.10.1 pytest-env==0.6.2 pytest-xdist==2.3.0 From 107feb2bf4f968fb616d70479e3e1594d71099c6 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 00:19:37 -0800 Subject: [PATCH 3/9] Reincrement Django version I don't actually expect this one to fix the tests, but we decreased the Django version with that change, and if we had this version working before (which it seems like we did) we should keep it. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e28323bd2d..f3257c3d31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ aiohttp==3.9.2 bleach==5.0.1 celery==5.3.1 colorthief==0.2.1 -Django==3.2.20 +Django==3.2.24 django-celery-beat==2.4.0 django-compressor==4.3.1 django-imagekit==4.1.0 From 3aa10dd5e5eead24c12186250993e57f15cbc9d8 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 00:24:16 -0800 Subject: [PATCH 4/9] Reverting new version pins tornado and grpcio were added as newly-independently-declared dependencies, so my next guess is that maybe something needs a different version of one or both? --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f3257c3d31..d2cae82fe2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,6 @@ django-sass-processor==1.2.2 django-csp==3.7 environs==9.5.0 flower==1.2.0 -grpcio==1.57.0 libsass==0.22.0 Markdown==3.4.1 Pillow==9.4.0 @@ -35,7 +34,6 @@ opentelemetry-sdk==1.16.0 protobuf==3.20.* pyotp==2.8.0 qrcode==7.3.1 -tornado==6.3.3 # Dev pytest-django==4.1.0 From 9802969640b8d887fb69d9a6885f5818988c8a74 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 00:27:42 -0800 Subject: [PATCH 5/9] Adding back removed dependency bw-file-resubmit==0.6.0rc2 had been removed in this commit; adding it back. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index d2cae82fe2..3405167868 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ aiohttp==3.9.2 bleach==5.0.1 +bw-file-resubmit==0.6.0rc2 celery==5.3.1 colorthief==0.2.1 Django==3.2.24 From 9fc34c202c3a88204eb1cc4186d0c6b7495b9352 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 00:34:38 -0800 Subject: [PATCH 6/9] Add back the pins for grpcio and tornado Seeing if tests still pass with these pins now that I've fixed them --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index 3405167868..76ba7bc74e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,6 +12,7 @@ django-sass-processor==1.2.2 django-csp==3.7 environs==9.5.0 flower==1.2.0 +grpcio==1.57.0 libsass==0.22.0 Markdown==3.4.1 Pillow==9.4.0 @@ -35,6 +36,7 @@ opentelemetry-sdk==1.16.0 protobuf==3.20.* pyotp==2.8.0 qrcode==7.3.1 +tornado==6.3.3 # Dev pytest-django==4.1.0 From 430d950db24dcd761bd823ed0ea45b212db8e481 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 00:37:19 -0800 Subject: [PATCH 7/9] Revert 003531b Do the tests re-break if we leave Pytest upgraded? --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 76ba7bc74e..fe03fc187a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,7 @@ tornado==6.3.3 # Dev pytest-django==4.1.0 -pytest==6.1.2 +pytest==6.2.5 pytest-cov==2.10.1 pytest-env==0.6.2 pytest-xdist==2.3.0 From b4682ee2148350ca0c68dd2e4f0b23314213d073 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 00:49:48 -0800 Subject: [PATCH 8/9] Reincrement Python version With everything else back and only the dependency deletion reverted, tests still pass. Can we have Python 3.11, too??? --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b3cd26e887..82b0c92c50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9 +FROM python:3.11 ENV PYTHONUNBUFFERED 1 From 9fe5f55086c61b3c2added7d7ebf71b38df551f5 Mon Sep 17 00:00:00 2001 From: Margaret Fero Date: Thu, 29 Feb 2024 01:17:37 -0800 Subject: [PATCH 9/9] Remove duplicate types-requests dependency We currently call for an identical version of types-requests twice at the very end of requirements.txt. This removes one of those lines. --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fe03fc187a..97dc39e6df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,4 +56,3 @@ types-Pillow==10.0.0.3 types-psycopg2==2.9.21.11 types-python-dateutil==2.8.19.14 types-requests==2.31.0.2 -types-requests==2.31.0.2