diff options
| author | Tobias Henkel <tobias.henkel@bmw.de> | 2018-09-04 08:30:07 +0200 |
|---|---|---|
| committer | James E. Blair <jeblair@redhat.com> | 2018-09-04 15:40:08 -0700 |
| commit | 85f65987229a0c5233b1e52ee0f2ae7f2d076d65 (patch) | |
| tree | 8476dde23fce788f98593daf0b62816660ae3a0b | |
| parent | cea6505d1b79ff19ae65a923e4c1c7d00c921604 (diff) | |
| download | zuul-85f65987229a0c5233b1e52ee0f2ae7f2d076d65.tar.gz | |
Cap cherrypy and uncap sphinx
With the latest cherrypy version the tests run into the hard test
timeout. This is caused by a header conversion issue introduced in
cherrypy 18.0.0. There is a pull request [1] that fixes this
issue. Once this is merged and released we can uncap it again.
The newest reno release, 2.10.0, requires a feature of newer sphinx without
specifying that the minimum compatibility has changed. Uncap sphinx here
so at least the doc build is not broken, use Sphinx 1.6.1 since that is
the oldest sphinx version supporting what reno needs.
[1] https://github.com/cherrypy/cherrypy/pull/1736
Change-Id: Ic00e664152062d1fc1677e467b638ac2be99aef1
Co-Authored-By: Andreas Jaeger <jaegerandi@gmail.com>
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index 4e6611f5e..ee4921308 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,6 +24,6 @@ iso8601 psutil fb-re2>=1.0.6 paho-mqtt -cherrypy +cherrypy<18.0.0 ws4py routes diff --git a/test-requirements.txt b/test-requirements.txt index 62653ed6d..2aad38abd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ flake8 coverage>=3.6 -sphinx>=1.5.1,<1.6 +sphinx>=1.6.1 sphinxcontrib-blockdiag>=1.1.0 fixtures>=0.3.14 stestr>=1.0.0 # Apache-2.0 |