aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-12-01 00:47:55 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-12-01 00:47:55 -0500
commit6d3a07f4fb3094c6868514fcae1cec24c647d2a6 (patch)
tree8a992775260efc3a284cb77fce8e2f2e800fcedf
parent5dcdd10b0ce56da1d7088d80b4e24c66e5407e35 (diff)
parent491e9c8ab4cdbba26cb13716b686991111759b39 (diff)
downloadcryptography-6d3a07f4fb3094c6868514fcae1cec24c647d2a6.tar.gz
cryptography-6d3a07f4fb3094c6868514fcae1cec24c647d2a6.tar.bz2
cryptography-6d3a07f4fb3094c6868514fcae1cec24c647d2a6.zip
Merge pull request #2500 from reaperhulk/pin-sphinx
pin sphinx to 1.3.1 while we sort out the bytes repr issue with 1.3.2
-rw-r--r--dev-requirements.txt2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index b33b5e68..c409ff92 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -9,7 +9,7 @@ pretend
pyasn1_modules
pytest
requests
-sphinx
+sphinx==1.3.1
sphinx_rtd_theme
sphinxcontrib-spelling
tox
diff --git a/tox.ini b/tox.ini
index 35dc5671..63f1e4bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ deps =
doc8
pyenchant
readme>=0.5.1
- sphinx
+ sphinx==1.3.1
sphinx_rtd_theme
sphinxcontrib-spelling
basepython = python2.7