diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | ci/requirements.pip | 4 | ||||
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | doc/contributing.rst | 2 | ||||
| -rw-r--r-- | requirements/dev.pip (renamed from requirements.pip) | 9 | ||||
| -rw-r--r-- | requirements/tox.pip | 2 | ||||
| -rw-r--r-- | requirements/wheel.pip | 3 | ||||
| -rw-r--r-- | tox_wheels.ini | 7 |
9 files changed, 17 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index fab44244..2f33ba70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: - TOXENV=pypy install: - - pip install -r ci/requirements.pip + - pip install -r requirements/tox.pip script: - tox diff --git a/appveyor.yml b/appveyor.yml index 90df51af..15522a7f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -112,7 +112,7 @@ install: - "pip install --disable-pip-version-check --user --upgrade pip" # Install requirements. - - "%CMD_IN_ENV% pip install -r ci/requirements.pip" + - "%CMD_IN_ENV% pip install -r requirements/tox.pip -r requirements/wheel.pip" build_script: # If not a metacov job, then build wheels and .exe installers. diff --git a/ci/requirements.pip b/ci/requirements.pip deleted file mode 100644 index 74bcc574..00000000 --- a/ci/requirements.pip +++ /dev/null @@ -1,4 +0,0 @@ -# Things to install in continuous integration environments. -setuptools==18.2 -tox==2.1.1 -wheel==0.24.0 @@ -11,7 +11,7 @@ dependencies: pre: - pip install -U pip override: - - pip install -r ci/requirements.pip + - pip install -r requirements/tox.pip test: override: diff --git a/doc/contributing.rst b/doc/contributing.rst index 8690fff5..dc50202c 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -49,7 +49,7 @@ these steps: #. Install the requirements:: - $ pip install -r requirements.pip + $ pip install -r requirements/dev.pip #. Install a number of versions of Python. Coverage.py supports a wide range of Python versions. The more you can test with, the more easily your code diff --git a/requirements.pip b/requirements/dev.pip index 74b06641..07920bfa 100644 --- a/requirements.pip +++ b/requirements/dev.pip @@ -1,19 +1,20 @@ # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 # For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt +# Requirements for doing local development work on coverage.py. # https://requires.io/github/nedbat/coveragepy/requirements/ -# PyPI requirements for running tests for coverage.py +# PyPI requirements for running tests. nose==1.3.7 -tox==2.1.1 +-r tox.pip -# and for linting... +# for linting. greenlet==0.4.9 mock==1.3.0 PyContracts==1.7.6 pyenchant==1.6.6 pylint==1.4.4 -# and for kitting... +# for kitting. requests==2.7.0 twine==1.5.0 diff --git a/requirements/tox.pip b/requirements/tox.pip new file mode 100644 index 00000000..9080d82e --- /dev/null +++ b/requirements/tox.pip @@ -0,0 +1,2 @@ +# The version of tox used by coverage.py +tox==2.1.1 diff --git a/requirements/wheel.pip b/requirements/wheel.pip new file mode 100644 index 00000000..13c6150c --- /dev/null +++ b/requirements/wheel.pip @@ -0,0 +1,3 @@ +# Things needed to make wheels for coverage.py +setuptools==18.2 +wheel==0.24.0 diff --git a/tox_wheels.ini b/tox_wheels.ini index 8494ec50..f956183d 100644 --- a/tox_wheels.ini +++ b/tox_wheels.ini @@ -6,9 +6,8 @@ envlist = py{26,27,33,34,35} toxworkdir = {toxinidir}/.tox_kits [testenv] +deps = + -rrequirements/wheel.pip + commands = python setup.py bdist_wheel {posargs} - -deps = - wheel - setuptools >= 6.0.0 |