diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2016-12-31 10:00:54 -0500 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2016-12-31 10:00:54 -0500 |
| commit | 939aa5d8dc0ef8c29db32abadf956fbec64d7a97 (patch) | |
| tree | ef0a50b912b290969e3f8d67d1ee8ff3aade79ba | |
| parent | d4527c3eee82d95763658b29cf5b80b17e098c4b (diff) | |
| download | python-coveragepy-939aa5d8dc0ef8c29db32abadf956fbec64d7a97.tar.gz | |
Better ways to install requirements on CI servers
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | requirements/ci.pip | 7 | ||||
| -rw-r--r-- | requirements/dev.pip | 4 | ||||
| -rw-r--r-- | requirements/pytest.pip | 7 | ||||
| -rw-r--r-- | tox.ini | 4 |
6 files changed, 18 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 71affc6..9c61f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ env: sudo: false install: - - pip install -r requirements/tox.pip + - pip install -r requirements/ci.pip script: - tox diff --git a/appveyor.yml b/appveyor.yml index 897a76d..0f4d8de 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -113,7 +113,7 @@ install: - "pip install --disable-pip-version-check --user --upgrade virtualenv" # Install requirements. - - "%CMD_IN_ENV% pip install -r requirements/dev.pip -r requirements/wheel.pip" + - "%CMD_IN_ENV% pip install -r requirements/ci.pip" # Make a python3.4.bat file in the current directory so that tox will find it # and python3.4 will mean what we want it to. diff --git a/requirements/ci.pip b/requirements/ci.pip new file mode 100644 index 0000000..0c560d4 --- /dev/null +++ b/requirements/ci.pip @@ -0,0 +1,7 @@ +# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 +# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt + +# Things CI servers need to succeeed. +-r tox.pip +-r pytest.pip +-r wheel.pip diff --git a/requirements/dev.pip b/requirements/dev.pip index 67a912f..948f1cc 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -6,9 +6,7 @@ # PyPI requirements for running tests. -r tox.pip - -# for igor and linting. -pytest==3.0.5 +-r pytest.pip # for linting. greenlet==0.4.11 diff --git a/requirements/pytest.pip b/requirements/pytest.pip new file mode 100644 index 0000000..e2e7009 --- /dev/null +++ b/requirements/pytest.pip @@ -0,0 +1,7 @@ +# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 +# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt + +# The pytest specifics used by coverage.py +pytest==3.0.5 +pytest-xdist==1.15.0 +pytest-warnings==0.2.0 @@ -10,9 +10,7 @@ usedevelop = True deps = # https://requires.io/github/nedbat/coveragepy/requirements/ - pytest==3.0.5 - pytest-xdist==1.15.0 - pytest-warnings==0.2.0 + -rrequirements/pytest.pip pip==9.0.1 mock==2.0.0 PyContracts==1.7.15 |