Skip to content

Commit 4d4a81f

Browse files
author
Elod Illes
committed
Blacklist setuptools 40.7.0
Setuptools 40.7.0 introduced support for non-ascii chars in setup.cfg [1], which causes python2.7 based sphinx jobs to fail with str-unicode mismatch, e.g. with [2]: 'error: 'builder' must be a list of strings (got u'html,man') See issue [3]. Conflicts: global-requirements.txt [1] https://setuptools.readthedocs.io/en/latest/history.html#v40-7-0 [2] http://logs.openstack.org/periodic-stable/git.openstack.org/openstack/keystone/stable/queens/build-openstack-sphinx-docs/0ea4957/job-output.txt.gz#_2019-01-28_06_18_25_401045 [3] pypa/setuptools#1653 Change-Id: I8921639cc4a1edfa0ac9d46a7cc03549aa6189aa (cherry picked from commit 5989f40) (cherry picked from commit 71f6094)
1 parent 7d1389c commit 4d4a81f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

global-requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@ selenium>=2.50.1 # Apache-2.0
381381
# situations as progressive releases of projects are done.
382382
# Blacklist setuptools 34.0.0-34.3.2 due to https://github.com/pypa/setuptools/issues/951
383383
# Blacklist setuptools 36.2.0 due to https://github.com/pypa/setuptools/issues/1086
384-
setuptools>=16.0,!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0 # PSF/ZPL
384+
# Blacklist setuptools 40.7.0 due to https://github.com/pypa/setuptools/issues/1653
385+
setuptools>=16.0,!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,!=40.7.0 # PSF/ZPL
385386
sphinx>=1.2.1,!=1.3b1,<1.4 # BSD
386387
sphinx-testing # BSD License
387388
sphinxcontrib-blockdiag # BSD

0 commit comments

Comments
 (0)