Skip to content

Commit

Permalink
Parenthesize conditional requirement in setup.py
Browse files Browse the repository at this point in the history
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 pypa/setuptools#1242
Closes jupyter#324
  • Loading branch information
Carreau committed Dec 30, 2017
1 parent 4d1ee2a commit 446ab64
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions docs/changelog.rst
Expand Up @@ -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
===

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -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,
Expand Down

0 comments on commit 446ab64

Please sign in to comment.