Requirements: pin django-ipware<6 (#10932)

readthedocs · Nov 28, 2023 · e321504 · e321504
1 parent 5495f07
commit e321504
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/requirements/deploy.txt b/requirements/deploy.txt
@@ -144,7 +144,7 @@ django-formtools==2.3
     # via -r requirements/pip.txt
 django-gravatar2==1.4.4
     # via -r requirements/pip.txt
-django-ipware==6.0.0
+django-ipware==5.0.2
     # via
     #   -r requirements/pip.txt
     #   django-structlog
@@ -300,10 +300,6 @@ python-dateutil==2.8.2
     #   botocore
     #   elasticsearch-dsl
     #   python-crontab
-python-ipware==2.0.0
-    # via
-    #   -r requirements/pip.txt
-    #   django-ipware
 python3-openid==3.2.0
     # via
     #   -r requirements/pip.txt

diff --git a/requirements/docker.txt b/requirements/docker.txt
@@ -155,7 +155,7 @@ django-formtools==2.3
     # via -r requirements/pip.txt
 django-gravatar2==1.4.4
     # via -r requirements/pip.txt
-django-ipware==6.0.0
+django-ipware==5.0.2
     # via
     #   -r requirements/pip.txt
     #   django-structlog
@@ -333,10 +333,6 @@ python-dateutil==2.8.2
     #   botocore
     #   elasticsearch-dsl
     #   python-crontab
-python-ipware==2.0.0
-    # via
-    #   -r requirements/pip.txt
-    #   django-ipware
 python3-openid==3.2.0
     # via
     #   -r requirements/pip.txt

diff --git a/requirements/pip.in b/requirements/pip.in
@@ -162,7 +162,12 @@ django-csp
 
 # Upgrading to 3.x requires some extra work
 # https://django-structlog.readthedocs.io/en/latest/upgrade_guide.html#upgrading-to-3-0
+# NOTE: that django-structlog is in version 6.x now,
+# so we should probably consider migrating to avoid incompatibility issues.
 django-structlog==2.2.0
+# Pining due to a Sentry error we started getting
+# https://read-the-docs.sentry.io/issues/4678167578/events/2d9d348729874d67b120b153908ca54c/
+django-ipware<6.0.0
 
 structlog
 dparse

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -107,8 +107,10 @@ django-formtools==2.3
     # via -r requirements/pip.in
 django-gravatar2==1.4.4
     # via -r requirements/pip.in
-django-ipware==6.0.0
-    # via django-structlog
+django-ipware==5.0.2
+    # via
+    #   -r requirements/pip.in
+    #   django-structlog
 django-messages-extends==0.6.3
     # via -r requirements/pip.in
 django-polymorphic==3.1.0
@@ -210,8 +212,6 @@ python-dateutil==2.8.2
     #   botocore
     #   elasticsearch-dsl
     #   python-crontab
-python-ipware==2.0.0
-    # via django-ipware
 python3-openid==3.2.0
     # via django-allauth
 pytz==2023.3.post1

diff --git a/requirements/testing.txt b/requirements/testing.txt
@@ -149,7 +149,7 @@ django-formtools==2.3
     # via -r requirements/pip.txt
 django-gravatar2==1.4.4
     # via -r requirements/pip.txt
-django-ipware==6.0.0
+django-ipware==5.0.2
     # via
     #   -r requirements/pip.txt
     #   django-structlog
@@ -317,10 +317,6 @@ python-dateutil==2.8.2
     #   botocore
     #   elasticsearch-dsl
     #   python-crontab
-python-ipware==2.0.0
-    # via
-    #   -r requirements/pip.txt
-    #   django-ipware
 python3-openid==3.2.0
     # via
     #   -r requirements/pip.txt