Release 5.7.3

Should finally address the `boto3` vs. `requests` issues with `urllib3` collisions.
elastic · Apr 25, 2019 · 0ffd19f · 0ffd19f
1 parent d937fd1
commit 0ffd19f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/curator/_version.py b/curator/_version.py
@@ -1 +1 @@
-__version__ = '5.7.2'
+__version__ = '5.7.3'
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,6 +3,15 @@
 Changelog
 =========
 
+5.7.3 (24 April 2019)
+---------------------
+
+**Bug Fix**
+
+  * Still further package collisions with ``urllib3`` between ``boto3`` and
+    ``requests``.  It was working, but with an unacceptable error, which is
+    addressed in release 5.7.3. (untergeek)
+
 5.7.2 (24 April 2019)
 ---------------------
 

diff --git a/docs/asciidoc/index.asciidoc b/docs/asciidoc/index.asciidoc
@@ -1,4 +1,4 @@
-:curator_version: 5.7.2
+:curator_version: 5.7.3
 :curator_major: 5
 :curator_doc_tree: 5.7
 :es_py_version: 7.0.0

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,10 @@
 voluptuous>=0.9.3
 elasticsearch>=7.0.0,<8.0.0
-urllib3==1.24.1
+urllib3>=1.21,<1.23
+requests==2.18.4
 boto3>=1.7.24
 requests_aws4auth>=0.9
 click>=6.7,<7.0
 pyyaml==3.12
-certifi>=2018.10.15
+certifi>=2019.3.9
 six>=1.11.0
diff --git a/setup.cfg b/setup.cfg
@@ -22,22 +22,25 @@ classifiers =
 install_requires = 
     voluptuous>=0.9.3
     elasticsearch>=7.0.0,<8.0.0
+    urllib3>=1.21,<1.23
+    requests==2.18.4
     boto3>=1.7.24
     requests_aws4auth>=0.9
     click>=6.7,<7.0
-    pyyaml>=3.10
-    certifi>=2018.10.15
+    pyyaml==3.12
+    certifi>=2019.3.9
     six>=1.11.0
 
 setup_requires =
     voluptuous>=0.9.3
     elasticsearch>=7.0.0,<8.0.0
-    urllib3==1.24.1
+    urllib3>=1.21,<1.23
+    requests==2.18.4
     boto3>=1.7.24
     requests_aws4auth>=0.9
     click>=6.7,<7.0
-    pyyaml>=3.10
-    certifi>=2018.10.15
+    pyyaml==3.12
+    certifi>=2019.3.9
     six>=1.11.0
 
 packages = curator

diff --git a/setup.py b/setup.py
@@ -23,13 +23,14 @@ def get_version():
 
 def get_install_requires():
     res = ['elasticsearch>=7.0.0,<8.0.0' ]
-    res.append('urllib3==1.24.1')
+    res.append('urllib3>=1.21,<1.23')
+    res.append('requests==2.18.4')
     res.append('boto3>=1.7.24')
     res.append('requests_aws4auth>=0.9')
     res.append('click>=6.7,<7.0')
-    res.append('pyyaml>=3.10')
+    res.append('pyyaml==3.12')
     res.append('voluptuous>=0.9.3')
-    res.append('certifi>=2018.10.15')
+    res.append('certifi>=2019.3.9')
     res.append('six>=1.11.0')
     return res