Merge pull request #822 from untergeek/fix/821

Fix/821
elastic · Nov 22, 2016 · 3af4678 · 3af4678
2 parents 9bb4a87 + c09f395
commit 3af4678
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/curator/_version.py b/curator/_version.py
@@ -1 +1 @@
-__version__ = '4.2.3'
+__version__ = '4.2.3.post1'
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,6 +3,19 @@
 Changelog
 =========
 
+4.2.3.post1 (22 November 2016)
+------------------------------
+
+This fix is `only` going in for ``pip``-based installs.  There are no other code
+changes.
+
+**Bug Fixes**
+
+  * Fixed incorrect assumption of PyPI picking up dependency for certifi.  It
+    is still a dependency, but should not affect ``pip`` installs with an error
+    any more.  Reported in #821 (untergeek)
+
+
 4.2.3 (21 November 2016)
 ------------------------
 

diff --git a/setup.py b/setup.py
@@ -2,9 +2,6 @@
 import re
 import sys
 from setuptools import setup
-import certifi
-
-cert_file = certifi.where()
 
 # Utility function to read from file.
 def fread(fname):
@@ -35,6 +32,11 @@ def get_install_requires():
 try:
     ### cx_Freeze ###
     from cx_Freeze import setup, Executable
+    try:
+        import certifi
+        cert_file = certifi.where()
+    except ImportError:
+        cert_file = ''
     # Dependencies are automatically detected, but it might need
     # fine tuning.
     buildOptions = dict(