summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-04-21 12:31:54 -0400
committerJason R. Coombs <jaraco@jaraco.com>2017-04-21 12:40:43 -0400
commit243e44fdb797ae54a08eb02d924f88e775e74ba9 (patch)
tree6bf95f7a3aa2da6de6a1f01fbc8f71355e7231b1
parentfbe7cb7fa1c0f4e30f6ac6e886c49ab6491aa959 (diff)
downloadpytest-runner-243e44fdb797ae54a08eb02d924f88e775e74ba9.tar.gz
Move requirements for docs and testing into extras
-rw-r--r--.readthedocs.yml4
-rw-r--r--docs/requirements.txt4
-rw-r--r--setup.py9
-rw-r--r--tests/requirements.txt2
-rw-r--r--tox.ini4
5 files changed, 13 insertions, 10 deletions
diff --git a/.readthedocs.yml b/.readthedocs.yml
index e83d731..8ae4468 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,3 +1,5 @@
-requirements_file: docs/requirements.txt
python:
version: 3
+ extra_requirements:
+ - docs
+ pip_install: true
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index e7b6a74..0000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-.
-sphinx
-jaraco.packaging>=3.2
-rst.linker>=1.9
diff --git a/setup.py b/setup.py
index 892b6b3..2bed3f7 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,15 @@ params = dict(
install_requires=[
],
extras_require={
+ 'testing': [
+ 'pytest>=2.8',
+ 'pytest-sugar',
+ ],
+ 'docs': [
+ 'sphinx',
+ 'jaraco.packaging>=3.2',
+ 'rst.linker>=1.9',
+ ],
},
setup_requires=[
'setuptools_scm>=1.15.0',
diff --git a/tests/requirements.txt b/tests/requirements.txt
deleted file mode 100644
index d9e0f33..0000000
--- a/tests/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-pytest >= 2.8
-pytest-sugar
diff --git a/tox.ini b/tox.ini
index d740130..8efcba6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,4 @@
[testenv]
-deps =
- -rtests/requirements.txt
-
commands = py.test {posargs}
usedevelop = True
+extras = testing