chore: Upgrade cryptography and pyopenssl

Ran 'make upgrade-package package="cryptography --upgrade-package pyopenssl"`
openedx · May 8, 2024 · 6f45093 · 6f45093
1 parent 460dad4
commit 6f45093
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 33 deletions.
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -60,14 +60,6 @@ markdown<3.4.0
 # Constraint can be removed once the issue https://github.com/PyCQA/pycodestyle/issues/1090 is fixed.
 pycodestyle<2.9.0
 
-# pyopenssl>22.0.0 requires cryptography>=38.0 && conflicts with snowflak-connector-python requires cryptography<37
-# which causes the requirements upgrade job to fail due to constraint conflict
-# This constraint can be removed once https://github.com/snowflakedb/snowflake-connector-python/issues/1259 is resolved
-# and snowflake-connector-python>2.8.0 is released.
-pyopenssl==22.0.0
-
-cryptography==38.0.4 # greater version has some issues with openssl.
-
 pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticket.
 
 # adding these constraints to minimize boto3 and botocore changeset

diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
@@ -16,10 +16,8 @@ codejail-includes==1.0.0
     # via -r requirements/edx-sandbox/base.in
 contourpy==1.1.1
     # via matplotlib
-cryptography==38.0.4
-    # via
-    #   -c requirements/edx-sandbox/../constraints.txt
-    #   -r requirements/edx-sandbox/base.in
+cryptography==42.0.7
+    # via -r requirements/edx-sandbox/base.in
 cycler==0.12.1
     # via matplotlib
 fonttools==4.49.0

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -156,9 +156,8 @@ coreschema==0.0.4
     #   drf-yasg
 crowdsourcehinter-xblock==0.7
     # via -r requirements/edx/bundled.in
-cryptography==38.0.4
+cryptography==41.0.7
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
     #   django-fernet-fields-v2
     #   edx-enterprise
@@ -912,9 +911,8 @@ pynacl==1.5.0
     # via edx-django-utils
 pynliner==0.8.0
     # via -r requirements/edx/kernel.in
-pyopenssl==22.0.0
+pyopenssl==23.3.0
     # via
-    #   -c requirements/edx/../constraints.txt
     #   optimizely-sdk
     #   snowflake-connector-python
 pyparsing==3.1.1

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -295,9 +295,8 @@ crowdsourcehinter-xblock==0.7
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-cryptography==38.0.4
+cryptography==41.0.7
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   django-fernet-fields-v2
@@ -1564,9 +1563,8 @@ pynliner==0.8.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-pyopenssl==22.0.0
+pyopenssl==23.3.0
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   optimizely-sdk

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -202,9 +202,8 @@ coreschema==0.0.4
     #   drf-yasg
 crowdsourcehinter-xblock==0.7
     # via -r requirements/edx/base.txt
-cryptography==38.0.4
+cryptography==41.0.7
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   django-fernet-fields-v2
     #   edx-enterprise
@@ -1082,9 +1081,8 @@ pynacl==1.5.0
     #   edx-django-utils
 pynliner==0.8.0
     # via -r requirements/edx/base.txt
-pyopenssl==22.0.0
+pyopenssl==23.3.0
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   optimizely-sdk
     #   snowflake-connector-python

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -221,9 +221,8 @@ coverage[toml]==7.4.1
     #   pytest-cov
 crowdsourcehinter-xblock==0.7
     # via -r requirements/edx/base.txt
-cryptography==38.0.4
+cryptography==41.0.7
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   django-fernet-fields-v2
     #   edx-enterprise
@@ -1171,9 +1170,8 @@ pynacl==1.5.0
     #   edx-django-utils
 pynliner==0.8.0
     # via -r requirements/edx/base.txt
-pyopenssl==22.0.0
+pyopenssl==23.3.0
     # via
-    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   optimizely-sdk
     #   snowflake-connector-python

diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt
@@ -38,10 +38,8 @@ click==8.1.6
     #   -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
     #   -r scripts/user_retirement/requirements/base.in
     #   edx-django-utils
-cryptography==38.0.4
-    # via
-    #   -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
-    #   simple-salesforce
+cryptography==42.0.7
+    # via simple-salesforce
 django==4.2.9
     # via
     #   -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt

diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt
@@ -50,7 +50,7 @@ click==8.1.6
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   edx-django-utils
-cryptography==38.0.4
+cryptography==42.0.7
     # via
     #   -r scripts/user_retirement/requirements/base.txt
     #   moto