aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-06-03 21:31:16 -0400
committerJason R. Coombs <jaraco@jaraco.com>2016-06-03 21:31:16 -0400
commit12e8b4c7d283cfbe4432703ee9698ef7232fdd77 (patch)
tree5b47196dae720ddba9be9de83308467e7cc7c732
parenta99a2b3ef7bc932d561a622fde9f5f81aaf2bada (diff)
downloadexternal_python_setuptools-12e8b4c7d283cfbe4432703ee9698ef7232fdd77.tar.gz
external_python_setuptools-12e8b4c7d283cfbe4432703ee9698ef7232fdd77.tar.bz2
external_python_setuptools-12e8b4c7d283cfbe4432703ee9698ef7232fdd77.zip
No longer build docs using 'build_sphinx' command and instead rely on RTD. Ref #604.
-rwxr-xr-xsetup.cfg11
-rwxr-xr-xsetup.py4
2 files changed, 2 insertions, 13 deletions
diff --git a/setup.cfg b/setup.cfg
index 4d0b30ff..0d1ea3ac 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,23 +9,14 @@ tag_date = 1
[aliases]
clean_egg_info = egg_info -RDb ''
-release = clean_egg_info sdist bdist_wheel build_sphinx
+release = clean_egg_info sdist bdist_wheel
source = register sdist binary
binary = bdist_egg upload --show-response
test = pytest
-[build_sphinx]
-source-dir = docs/
-build-dir = docs/build
-all_files = 1
-
[upload]
repository = https://upload.pypi.io/legacy/
-[upload_docs]
-upload-dir = docs/build/html
-repository = https://pypi.python.org/pypi
-
[sdist]
formats = gztar zip
diff --git a/setup.py b/setup.py
index 6cde31f7..98b046f8 100755
--- a/setup.py
+++ b/setup.py
@@ -61,8 +61,6 @@ if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \
needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
pytest_runner = ['pytest-runner'] if needs_pytest else []
-needs_sphinx = set(['build_sphinx', 'upload_docs', 'release']).intersection(sys.argv)
-sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else []
needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
wheel = ['wheel'] if needs_wheel else []
@@ -158,7 +156,7 @@ setup_params = dict(
'pytest>=2.8',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[
- ] + sphinx + pytest_runner + wheel,
+ ] + pytest_runner + wheel,
)
if __name__ == '__main__':