diff options
| -rw-r--r-- | .github/workflows/coverage.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/kit.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/quality.yml | 4 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | requirements/ci.in | 3 | ||||
| -rw-r--r-- | requirements/wheel.in | 11 | ||||
| -rw-r--r-- | requirements/wheel.pip | 15 | ||||
| -rw-r--r-- | tox.ini | 2 |
8 files changed, 18 insertions, 38 deletions
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c15eac96..3ea67b2b 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -101,7 +101,7 @@ jobs: set -xe python -VV python -m site - python setup.py --quiet clean develop + python -m pip install -e . python igor.py zip_mods - name: "Download coverage data" diff --git a/.github/workflows/kit.yml b/.github/workflows/kit.yml index 0d467b21..5d6a7502 100644 --- a/.github/workflows/kit.yml +++ b/.github/workflows/kit.yml @@ -50,9 +50,9 @@ jobs: with: python-version: "3.8" - - name: "Install cibuildwheel" + - name: "Install tools" run: | - python -m pip install -c requirements/pins.pip cibuildwheel + python -m pip install -r requirements/ci.pip - name: "Build wheels" env: @@ -81,9 +81,13 @@ jobs: with: python-version: "3.8" + - name: "Install tools" + run: | + python -m pip install -r requirements/ci.pip + - name: "Build sdist" run: | - python setup.py sdist + python -m build ls -al dist/ - name: "Upload sdist" @@ -106,7 +110,7 @@ jobs: - name: "Install requirements" run: | - pypy3 -m pip install -r requirements/wheel.pip + pypy3 -m pip install -r requirements/ci.pip - name: "Build wheels" run: | @@ -146,7 +150,7 @@ jobs: - name: "Install wheel tools" run: | - python -m pip install -r requirements/wheel.pip + python -m pip install -r requirements/ci.pip - name: "Build wheel" run: | diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 7df3c988..9b15dfca 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 -c requirements/pins.pip tox + python -m pip install -r requirements/ci.pip - name: "Tox lint" run: | @@ -63,7 +63,7 @@ jobs: set -xe python -VV python -m site - python -m pip install -c requirements/pins.pip tox + python -m pip install -r requirements/ci.pip - name: "Tox doc" run: | @@ -73,20 +73,19 @@ metahtml: ## Produce meta-coverage HTML reports. python igor.py combine_html upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade -upgrade: ## update the *.pip files with the latest packages satisfying *.in files +upgrade: ## update the *.pip files with the latest packages satisfying *.in files pip install -q -r requirements/pip-tools.pip 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/dev.pip requirements/dev.in - pip-compile --upgrade -o requirements/wheel.pip requirements/wheel.in pip-compile --upgrade -o doc/requirements.pip doc/requirements.in # Kitting kit: ## Make the source distribution. - python setup.py sdist + python -m build kit_upload: ## Upload the built distributions to PyPI. twine upload --verbose dist/* diff --git a/requirements/ci.in b/requirements/ci.in index 151b1ec9..ce66aacc 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -6,6 +6,9 @@ # Things CI servers need for running tests. # "make upgrade" turns this into requirements/ci.pip. +auditwheel +build +cibuildwheel setuptools tox tox-gh-actions diff --git a/requirements/wheel.in b/requirements/wheel.in deleted file mode 100644 index 1d82a2bf..00000000 --- a/requirements/wheel.in +++ /dev/null @@ -1,11 +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 - --c pins.pip - -# Things needed to make wheels for coverage.py -# "make upgrade" turns this into requirements/wheel.pip. - -auditwheel -setuptools -wheel diff --git a/requirements/wheel.pip b/requirements/wheel.pip deleted file mode 100644 index dd4a6dc0..00000000 --- a/requirements/wheel.pip +++ /dev/null @@ -1,15 +0,0 @@ -# -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: -# -# make upgrade -# -auditwheel==5.0.0 - # via -r requirements/wheel.in -pyelftools==0.27 - # via auditwheel -wheel==0.37.0 - # via -r requirements/wheel.in - -# The following packages are considered to be unsafe in a requirements file: -# setuptools @@ -81,7 +81,7 @@ commands = python -m tabnanny {env:LINTABLE} python igor.py check_eol check-manifest --ignore 'lab/*,perf/*,doc/sample_html/*,.treerc,.github*' - python setup.py -q sdist bdist_wheel + python -m build twine check dist/* python -m pylint --notes= {env:LINTABLE} |