summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2021-10-25 08:47:06 -0400
committerNed Batchelder <ned@nedbatchelder.com>2021-10-25 09:07:07 -0400
commit2d2d6088b94845ffc4062853aa7230879ee66a44 (patch)
tree36799c50a1f2edc8ffe5a76e5e00f987d028d011
parentf88278e8102b304849f8d237314b88182658a874 (diff)
downloadpython-coveragepy-git-2d2d6088b94845ffc4062853aa7230879ee66a44.tar.gz
build: a minimal tox.pip for getting tox started
No need to install a lot of junk just to have tox make a new venv and install things into it. And then ci.pip can be much smaller, installing just what kits need: kit.pip
-rw-r--r--.github/workflows/coverage.yml4
-rw-r--r--.github/workflows/kit.yml10
-rw-r--r--.github/workflows/quality.yml4
-rw-r--r--.github/workflows/testsuite.yml4
-rw-r--r--Makefile3
-rw-r--r--requirements/ci.pip134
-rw-r--r--requirements/kit.in (renamed from requirements/ci.in)8
-rw-r--r--requirements/kit.pip39
-rw-r--r--requirements/tox.in10
-rw-r--r--requirements/tox.pip38
10 files changed, 100 insertions, 154 deletions
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 3ea67b2b..0b0f41ea 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -62,9 +62,7 @@ jobs:
set -xe
python -VV
python -m site
- # Need to install setuptools first so that ci.pip will succeed.
- python -m pip install -c requirements/ci.pip setuptools wheel
- python -m pip install -r requirements/ci.pip
+ python -m pip install -r requirements/tox.pip
- name: "Run tox coverage for ${{ matrix.python-version }}"
env:
diff --git a/.github/workflows/kit.yml b/.github/workflows/kit.yml
index 5d6a7502..dff56cda 100644
--- a/.github/workflows/kit.yml
+++ b/.github/workflows/kit.yml
@@ -52,7 +52,7 @@ jobs:
- name: "Install tools"
run: |
- python -m pip install -r requirements/ci.pip
+ python -m pip install -r requirements/kit.pip
- name: "Build wheels"
env:
@@ -83,7 +83,7 @@ jobs:
- name: "Install tools"
run: |
- python -m pip install -r requirements/ci.pip
+ python -m pip install -r requirements/kit.pip
- name: "Build sdist"
run: |
@@ -110,7 +110,7 @@ jobs:
- name: "Install requirements"
run: |
- pypy3 -m pip install -r requirements/ci.pip
+ pypy3 -m pip install -r requirements/kit.pip
- name: "Build wheels"
run: |
@@ -150,11 +150,11 @@ jobs:
- name: "Install wheel tools"
run: |
- python -m pip install -r requirements/ci.pip
+ python -m pip install -r requirements/kit.pip
- name: "Build wheel"
run: |
- python setup.py bdist_wheel
+ python -m build
- name: "Convert to manylinux wheel"
if: runner.os == 'Linux'
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 9b15dfca..113536c8 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -39,7 +39,7 @@ jobs:
set -xe
python -VV
python -m site
- python -m pip install -r requirements/ci.pip
+ python -m pip install -r requirements/tox.pip
- name: "Tox lint"
run: |
@@ -63,7 +63,7 @@ jobs:
set -xe
python -VV
python -m site
- python -m pip install -r requirements/ci.pip
+ python -m pip install -r requirements/tox.pip
- name: "Tox doc"
run: |
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 268eb652..1073eacc 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -57,9 +57,7 @@ jobs:
set -xe
python -VV
python -m site
- # Need to install setuptools first so that ci.pip will succeed.
- python -m pip install -c requirements/ci.pip setuptools wheel
- python -m pip install -r requirements/ci.pip
+ python -m pip install -r requirements/tox.pip
- name: "Run tox for ${{ matrix.python-version }}"
continue-on-error: true
diff --git a/Makefile b/Makefile
index ae372fc4..1b8c3457 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,8 @@ upgrade: ## update the *.pip files with the latest packages satisfying *.in
pip-compile --upgrade -o requirements/pip-tools.pip requirements/pip-tools.in
pip-compile --upgrade -o requirements/pip.pip requirements/pip.in
pip-compile --upgrade -o requirements/pytest.pip requirements/pytest.in
- pip-compile --upgrade -o requirements/ci.pip requirements/ci.in
+ pip-compile --upgrade -o requirements/kit.pip requirements/kit.in
+ pip-compile --upgrade -o requirements/tox.pip requirements/tox.in
pip-compile --upgrade -o requirements/dev.pip requirements/dev.in
pip-compile --upgrade -o doc/requirements.pip doc/requirements.in
diff --git a/requirements/ci.pip b/requirements/ci.pip
deleted file mode 100644
index 6e688f4c..00000000
--- a/requirements/ci.pip
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
-#
-# make upgrade
-#
-attrs==21.2.0
- # via
- # -r requirements/pytest.pip
- # hypothesis
- # pytest
-auditwheel==5.0.0
- # via -r requirements/ci.in
-backports.entry-points-selectable==1.1.0
- # via virtualenv
-backports.functools-lru-cache==1.6.4
- # via
- # -r requirements/pytest.pip
- # pycontracts
-bashlex==0.16
- # via cibuildwheel
-bracex==2.2
- # via cibuildwheel
-build==0.7.0
- # via -r requirements/ci.in
-certifi==2021.10.8
- # via cibuildwheel
-cibuildwheel==2.1.3
- # via -r requirements/ci.in
-decorator==5.1.0
- # via
- # -r requirements/pytest.pip
- # pycontracts
-distlib==0.3.3
- # via virtualenv
-execnet==1.9.0
- # via
- # -r requirements/pytest.pip
- # pytest-xdist
-filelock==3.3.1
- # via
- # tox
- # virtualenv
-flaky==3.7.0
- # via -r requirements/pytest.pip
-future==0.18.2
- # via
- # -r requirements/pytest.pip
- # pycontracts
-hypothesis==6.24.0
- # via -r requirements/pytest.pip
-iniconfig==1.1.1
- # via
- # -r requirements/pytest.pip
- # pytest
-packaging==21.0
- # via
- # -r requirements/pytest.pip
- # build
- # cibuildwheel
- # pytest
- # tox
-pep517==0.12.0
- # via build
-platformdirs==2.4.0
- # via virtualenv
-pluggy==1.0.0
- # via
- # -r requirements/pytest.pip
- # pytest
- # tox
-py==1.10.0
- # via
- # -r requirements/pytest.pip
- # pytest
- # pytest-forked
- # tox
-pycontracts @ git+https://github.com/slorg1/contracts@collections_and_validator
- # via -r requirements/pytest.pip
-pyelftools==0.27
- # via auditwheel
-pyparsing==3.0.1
- # via
- # -r requirements/pytest.pip
- # packaging
- # pycontracts
-pytest==6.2.5
- # via
- # -r requirements/pytest.pip
- # pytest-forked
- # pytest-xdist
-pytest-forked==1.3.0
- # via
- # -r requirements/pytest.pip
- # pytest-xdist
-pytest-xdist==2.4.0
- # via -r requirements/pytest.pip
-qualname==0.1.0
- # via
- # -r requirements/pytest.pip
- # pycontracts
-six==1.16.0
- # via
- # -r requirements/pytest.pip
- # pycontracts
- # tox
- # virtualenv
-sortedcontainers==2.4.0
- # via
- # -r requirements/pytest.pip
- # hypothesis
-toml==0.10.2
- # via
- # -r requirements/pytest.pip
- # cibuildwheel
- # pytest
- # tox
-tomli==1.2.2
- # via
- # build
- # pep517
-tox==3.24.4
- # via
- # -r requirements/ci.in
- # tox-gh-actions
-tox-gh-actions==2.8.1
- # via -r requirements/ci.in
-virtualenv==20.9.0
- # via tox
-wheel==0.37.0
- # via -r requirements/ci.in
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
diff --git a/requirements/ci.in b/requirements/kit.in
index ce66aacc..a64ca7e9 100644
--- a/requirements/ci.in
+++ b/requirements/kit.in
@@ -3,15 +3,11 @@
-c pins.pip
-# Things CI servers need for running tests.
-# "make upgrade" turns this into requirements/ci.pip.
+# Things needed to make distribution kits.
+# "make upgrade" turns this into requirements/kit.pip.
auditwheel
build
cibuildwheel
setuptools
-tox
-tox-gh-actions
wheel
-
--r pytest.pip
diff --git a/requirements/kit.pip b/requirements/kit.pip
new file mode 100644
index 00000000..1c13884a
--- /dev/null
+++ b/requirements/kit.pip
@@ -0,0 +1,39 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+# make upgrade
+#
+auditwheel==5.0.0
+ # via -r requirements/kit.in
+bashlex==0.16
+ # via cibuildwheel
+bracex==2.2
+ # via cibuildwheel
+build==0.7.0
+ # via -r requirements/kit.in
+certifi==2021.10.8
+ # via cibuildwheel
+cibuildwheel==2.1.3
+ # via -r requirements/kit.in
+packaging==21.0
+ # via
+ # build
+ # cibuildwheel
+pep517==0.12.0
+ # via build
+pyelftools==0.27
+ # via auditwheel
+pyparsing==3.0.1
+ # via packaging
+toml==0.10.2
+ # via cibuildwheel
+tomli==1.2.2
+ # via
+ # build
+ # pep517
+wheel==0.37.0
+ # via -r requirements/kit.in
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements/tox.in b/requirements/tox.in
new file mode 100644
index 00000000..66ad2dc0
--- /dev/null
+++ b/requirements/tox.in
@@ -0,0 +1,10 @@
+# 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
+
+# Just install tox, which will then install more things.
+# "make upgrade" turns this into requirements/tox.pip.
+
+tox
+tox-gh-actions
diff --git a/requirements/tox.pip b/requirements/tox.pip
new file mode 100644
index 00000000..5d6e449f
--- /dev/null
+++ b/requirements/tox.pip
@@ -0,0 +1,38 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+# make upgrade
+#
+backports.entry-points-selectable==1.1.0
+ # via virtualenv
+distlib==0.3.3
+ # via virtualenv
+filelock==3.3.1
+ # via
+ # tox
+ # virtualenv
+packaging==21.0
+ # via tox
+platformdirs==2.4.0
+ # via virtualenv
+pluggy==1.0.0
+ # via tox
+py==1.10.0
+ # via tox
+pyparsing==3.0.1
+ # via packaging
+six==1.16.0
+ # via
+ # tox
+ # virtualenv
+toml==0.10.2
+ # via tox
+tox==3.24.4
+ # via
+ # -r requirements/tox.in
+ # tox-gh-actions
+tox-gh-actions==2.8.1
+ # via -r requirements/tox.in
+virtualenv==20.9.0
+ # via tox