diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-07-06 23:00:14 -0500 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-07-07 00:00:14 -0400 |
commit | 4fbc11d981502b8966e852aa6573f8a0349fce51 (patch) | |
tree | bf8bb14669261ae1023f63c4f46871e560035e98 | |
parent | e466bc917e070e34208a52838a0e21730345a78f (diff) | |
download | pyopenssl-4fbc11d981502b8966e852aa6573f8a0349fce51.tar.gz |
move deps to extras (#661)
* move deps to extras
* this file is gone
-rw-r--r-- | MANIFEST.in | 2 | ||||
-rw-r--r-- | docs-requirements.txt | 2 | ||||
-rwxr-xr-x | setup.py | 11 | ||||
-rw-r--r-- | tox.ini | 8 |
4 files changed, 16 insertions, 7 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 60b7c88..4ff05bf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include LICENSE MANIFEST.in *.rst tox.ini docs-requirements.txt .coveragerc +include LICENSE MANIFEST.in *.rst tox.ini .coveragerc exclude leakcheck recursive-include tests *.py recursive-include doc * diff --git a/docs-requirements.txt b/docs-requirements.txt deleted file mode 100644 index 8213302..0000000 --- a/docs-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -sphinx -sphinx_rtd_theme @@ -99,4 +99,15 @@ if __name__ == "__main__": "cryptography>=1.9", "six>=1.5.2" ], + extras_require={ + "test": [ + "flaky", + "pretend", + "pytest>=3.0.1", + ], + "docs": [ + "sphinx", + "sphinx_rtd_theme", + ] + }, ) @@ -5,11 +5,10 @@ envlist = {pypy,py26,py27,py33,py34,py35,py36}{,-cryptographyMaster,-cryptograph whitelist_externals = openssl passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH LD_LIBRARY_PATH TERM +extras = + test deps = coverage>=4.2 - pytest>=3.0.1 - pretend - flaky cryptographyMaster: git+https://github.com/pyca/cryptography.git cryptographyMinimum: cryptography<=1.9 setenv = @@ -71,7 +70,8 @@ commands = check-manifest [testenv:docs] -deps = -rdocs-requirements.txt +extras = + docs basepython = python2.7 commands = sphinx-build -W -b html doc doc/_build/html |