diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-01-19 11:54:02 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-02-06 18:15:35 -0500 |
| commit | 0559f17d4588553eb428d57ecfebab9e0e988e65 (patch) | |
| tree | 6773047a2cc502d7a611e623cb771f0d19d1c8e2 | |
| parent | 131482820238cb060b38e7e55bffabea4f0a3a0e (diff) | |
| download | python-setuptools-git-0559f17d4588553eb428d57ecfebab9e0e988e65.tar.gz | |
Bootstrap the environment in tox, allowing simple 'tox' to run tests and simplifying all of the pipelines.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/developer-guide.txt | 8 | ||||
| -rw-r--r-- | tools/tox_pip.py | 11 | ||||
| -rw-r--r-- | tox.ini | 4 |
6 files changed, 13 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 501a0b69..3ad310b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,8 +41,6 @@ install: - pip freeze --all - env -# update egg_info based on setup.py in checkout -- python bootstrap.py - "! grep pyc setuptools.egg-info/SOURCES.txt" script: diff --git a/appveyor.yml b/appveyor.yml index 08818069..02fe1ee5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,7 +28,6 @@ test_script: - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel - pip install --upgrade tox tox-venv virtualenv - pip freeze --all - - python bootstrap.py - tox -- --cov after_test: diff --git a/docs/conf.py b/docs/conf.py index cbd19fb4..6f6ae13a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,7 +26,7 @@ import os # hack to run the bootstrap script so that jaraco.packaging.sphinx # can invoke setup.py 'READTHEDOCS' in os.environ and subprocess.check_call( - [sys.executable, 'bootstrap.py'], + [sys.executable, '-m', 'bootstrap'], cwd=os.path.join(os.path.dirname(__file__), os.path.pardir), ) diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt index d145fba1..0b4ae4d4 100644 --- a/docs/developer-guide.txt +++ b/docs/developer-guide.txt @@ -104,12 +104,8 @@ from the command line after pushing a new branch. Testing ------- -The primary tests are run using tox. To run the tests, first create the metadata -needed to run the tests:: - - $ python bootstrap.py - -Then make sure you have tox installed, and invoke it:: +The primary tests are run using tox. Make sure you have tox installed, +and invoke it:: $ tox diff --git a/tools/tox_pip.py b/tools/tox_pip.py index f592e412..ba776638 100644 --- a/tools/tox_pip.py +++ b/tools/tox_pip.py @@ -13,9 +13,16 @@ def remove_setuptools(): subprocess.check_call(cmd, cwd='.tox') +def bootstrap(): + print("Running bootstrap") + cmd = [sys.executable, '-m', 'bootstrap'] + subprocess.check_call(cmd) + + def pip(args): - # When installing '.', remove setuptools - '.' in args and remove_setuptools() + if '.' in args: + remove_setuptools() + bootstrap() cmd = [sys.executable, '-m', 'pip'] + args subprocess.check_call(cmd) @@ -1,5 +1,3 @@ -# Note: Run "python bootstrap.py" before running Tox, to generate metadata. -# # To run Tox against all supported Python interpreters, you can set: # # export TOXENV='py27,py3{5,6,7,8},pypy,pypy3' @@ -47,7 +45,7 @@ commands=codecov -X gcov --file {toxworkdir}/coverage.xml deps = -r{toxinidir}/docs/requirements.txt skip_install=True commands = - python {toxinidir}/bootstrap.py + python -m bootstrap sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man |