From 2d2d6088b94845ffc4062853aa7230879ee66a44 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 25 Oct 2021 08:47:06 -0400 Subject: 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 --- .github/workflows/coverage.yml | 4 +--- .github/workflows/kit.yml | 10 +++++----- .github/workflows/quality.yml | 4 ++-- .github/workflows/testsuite.yml | 4 +--- 4 files changed, 9 insertions(+), 13 deletions(-) (limited to '.github') 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 -- cgit v1.2.1