Bootstrap the environment in tox, allowing simple 'tox' to run tests and simplifying all of the pipelines.
This commit is contained in:
parent
1314828202
commit
0559f17d45
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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),
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
4
tox.ini
4
tox.ini
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue