Merge remote-tracking branch 'origin/5.2.x' into 5.x

Get 5.2.1 changes into the 5.x branch
jupyter · Jan 24, 2018 · 5118a94 · 5118a94
2 parents 815c0aa + 5ced6c6
commit 5118a94
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,6 +4,13 @@
 Changes in Jupyter Client
 =========================
 
+5.2.1
+=====
+
+- Add parenthesis to conditional pytest requirement to work around a bug in the
+  ``wheel`` package, that generate a ``.whl`` which otherwise always depends on
+  ``pytest`` see :ghissue:`324` and :ghpull:`325`
+
 5.2
 ===
 

diff --git a/jupyter_client/_version.py b/jupyter_client/_version.py
@@ -1,4 +1,4 @@
-version_info = (5, 2, 0)
+version_info = (5, 2, 1)
 __version__ = '.'.join(map(str, version_info))
 
 protocol_version_info = (5, 3)

diff --git a/setup.py b/setup.py
@@ -87,7 +87,7 @@ def run(self):
     extras_require   = {
         'test': ['ipykernel', 'ipython', 'mock'],
         'test:python_version == "3.3"': ['pytest<3.3.0'],
-        'test:python_version >= "3.4" or python_version == "2.7"': ['pytest'],
+        'test:(python_version >= "3.4" or python_version == "2.7")': ['pytest'],
     },
     cmdclass         = {
         'bdist_egg': bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled,