Merge pull request #110 from earthgecko/luminosity

urllib3 fix to 1.24.3
earthgecko · May 8, 2019 · 0f9ad50 · 0f9ad50
2 parents 66c295e + b1624b9
commit 0f9ad50
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -463,4 +463,7 @@ slackclient==1.3.1
 # @modified 20190426 - Task #2964: Update dependencies
 # Mitigate CVE-2018-20060 and SNYK-PYTHON-URLLIB3-72681
 #urllib3>=1.24.1
-urllib3>=1.25.1
+# @modified 20190509 - Task #2964: Update dependencies
+# requests requires <= 1.24.3
+#urllib3>=1.25.1
+urllib3==1.24.3
diff --git a/docs/readthedocs.requirements.txt b/docs/readthedocs.requirements.txt
@@ -54,4 +54,4 @@ SQLAlchemy==1.3.3
 pymemcache==2.1.1
 PyJWT==1.7.1
 slackclient==1.3.1
-urllib3>=1.25.1
+urllib3==1.24.3
diff --git a/docs/releases/1_2_16.rst b/docs/releases/1_2_16.rst
@@ -154,6 +154,11 @@ How to update from v1.2.15
     # the following line and run it to fix to mysql-python-connector 8.0.6
     #cat "${CURRENT_SKYLINE_PATH}/requirements.txt" | grep -v "luminol\|mysql-connector-python" > /tmp/requirements.txt
 
+    # With v1.2.16 a urllib version of 1.25.2 was available but it does not work
+    # with requests
+    cat /tmp/requirements.txt | sed -e 's/urllib3.*/urllib3==1.24.3/g' > /tmp/requirements.2.1.16.txt
+    cat /tmp/requirements.2.1.16.txt > /tmp/requirements.txt
+
     bin/"pip${PYTHON_MAJOR_VERSION}" install -r /tmp/requirements.txt
 
 - Start the all Skyline services (change as appropriate for your set up) e.g.

diff --git a/requirements.txt b/requirements.txt
@@ -48,4 +48,4 @@ pymemcache==2.1.1
 PyJWT==1.7.1
 git+git://github.com/earthgecko/luminol@d429044#egg=luminol
 slackclient==1.3.1
-urllib3>=1.25.1
+urllib3==1.24.3