diff options
-rw-r--r-- | .github/workflows/kit.yml | 2 | ||||
-rw-r--r-- | .github/workflows/quality.yml | 4 | ||||
-rw-r--r-- | doc/requirements.pip | 2 | ||||
-rw-r--r-- | requirements/ci.pip | 3 | ||||
-rw-r--r-- | requirements/dev.pip | 3 | ||||
-rw-r--r-- | requirements/pins.pip | 1 | ||||
-rw-r--r-- | requirements/pip.pip | 2 | ||||
-rw-r--r-- | requirements/pytest.pip | 2 | ||||
-rw-r--r-- | requirements/tox.pip | 5 | ||||
-rw-r--r-- | requirements/wheel.pip | 2 | ||||
-rw-r--r-- | tox.ini | 1 |
11 files changed, 14 insertions, 13 deletions
diff --git a/.github/workflows/kit.yml b/.github/workflows/kit.yml index 519d8556..90834b52 100644 --- a/.github/workflows/kit.yml +++ b/.github/workflows/kit.yml @@ -136,7 +136,7 @@ jobs: - name: "Install wheel tools" run: | - python -m pip install -c requirements/pins.pip -r requirements/wheel.pip + python -m pip install -r requirements/wheel.pip - name: "Build wheel" run: | diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 1a1b7f03..80f75424 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -36,7 +36,7 @@ jobs: set -xe python -VV python -m site - python -m pip install -r requirements/tox.pip + python -m pip install -c requirements/pins.pip tox - name: "Tox lint" run: | @@ -60,7 +60,7 @@ jobs: set -xe python -VV python -m site - python -m pip install -r requirements/tox.pip + python -m pip install -c requirements/pins.pip tox - name: "Tox doc" run: | diff --git a/doc/requirements.pip b/doc/requirements.pip index f1f01c66..a29c01e2 100644 --- a/doc/requirements.pip +++ b/doc/requirements.pip @@ -1,5 +1,7 @@ # PyPI requirements for building documentation for coverage.py +-c ../requirements/pins.pip + # https://requires.io/github/nedbat/coveragepy/requirements/ doc8==0.8.1 diff --git a/requirements/ci.pip b/requirements/ci.pip index 72c6a790..2eba2f49 100644 --- a/requirements/ci.pip +++ b/requirements/ci.pip @@ -4,6 +4,5 @@ -c pins.pip # Things CI servers need for running tests. --r tox.pip +tox -r pytest.pip --r wheel.pip diff --git a/requirements/dev.pip b/requirements/dev.pip index 791a2fae..13a80b9f 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -4,12 +4,13 @@ # Requirements for doing local development work on coverage.py. # https://requires.io/github/nedbat/coveragepy/requirements/ +-c pins.pip -r pip.pip pluggy==0.13.1 # PyPI requirements for running tests. --r tox.pip +tox -r pytest.pip # for linting. diff --git a/requirements/pins.pip b/requirements/pins.pip index a6983bb0..02ba58a0 100644 --- a/requirements/pins.pip +++ b/requirements/pins.pip @@ -5,6 +5,7 @@ auditwheel==3.3.1 cibuildwheel==1.7.0 +tox==3.20.1 tox-gh-actions==2.2.0 # setuptools 45.x is py3-only diff --git a/requirements/pip.pip b/requirements/pip.pip index c7c4895f..3768f1ae 100644 --- a/requirements/pip.pip +++ b/requirements/pip.pip @@ -1,5 +1,7 @@ # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt +-c pins.pip + pip==20.2.4 virtualenv==20.2.1 diff --git a/requirements/pytest.pip b/requirements/pytest.pip index ecdf619c..1b696071 100644 --- a/requirements/pytest.pip +++ b/requirements/pytest.pip @@ -1,6 +1,8 @@ # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt +-c pins.pip + # The pytest specifics used by coverage.py # 4.x is last to support py2 diff --git a/requirements/tox.pip b/requirements/tox.pip deleted file mode 100644 index 0e0f20f2..00000000 --- a/requirements/tox.pip +++ /dev/null @@ -1,5 +0,0 @@ -# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 -# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt - -# The version of tox used by coverage.py -tox==3.20.1 diff --git a/requirements/wheel.pip b/requirements/wheel.pip index 1223cddd..4954d249 100644 --- a/requirements/wheel.pip +++ b/requirements/wheel.pip @@ -5,6 +5,6 @@ # Things needed to make wheels for coverage.py -auditwheel +auditwheel; python_version > '3.6' setuptools wheel @@ -17,7 +17,6 @@ deps = # https://requires.io/github/nedbat/coveragepy/requirements/ -r requirements/pip.pip -r requirements/pytest.pip - -r requirements/wheel.pip # gevent 1.3 causes a failure: https://github.com/nedbat/coveragepy/issues/663 py{27,35,36}: gevent==1.2.2 py{27,35,36,37,38}: eventlet==0.25.1 |