diff --git a/setup.cfg b/setup.cfg index 4d0b30ff38..0d1ea3acb7 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 6cde31f798..98b046f822 100755 --- a/setup.py +++ b/setup.py @@ -61,8 +61,6 @@ def _gen_console_scripts(): 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 @@ def _gen_console_scripts(): 'pytest>=2.8', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ - ] + sphinx + pytest_runner + wheel, + ] + pytest_runner + wheel, ) if __name__ == '__main__':