From 072a08727927ed0ac5c0b2cca0ccaa364109c060 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Sat, 30 Dec 2017 16:54:12 +0100 Subject: [PATCH] Parenthesize conditional requirement in setup.py Du to a likely bug in wheel, the conditional dependency on pytest ends up being unconditional. Seem like adding parenthesis fix that (as a work around). See https://github.com/pypa/setuptools/issues/1242 Closes #324 --- docs/changelog.rst | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 23cc0c953..d560cbfda 100644 --- 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/setup.py b/setup.py index 5de9cfd18..c184b40fa 100644 --- a/setup.py +++ b/setup.py @@ -88,7 +88,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,