diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index decf5f018..23178f7ec 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -20,12 +20,9 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: python -m pip install pep517 - - name: Evade 'pypa/pep517#74' - run: python -m pip install -U setuptools setuptools-scm pip wheel - if: startsWith(matrix.python-version, 'pypy') + run: python -m pip install build - name: Create packages - run: python -m pep517.build . + run: python -m build . - uses: actions/upload-artifact@master with: name: dist-${{ matrix.os }}-${{ matrix.python-version }} diff --git a/tox.ini b/tox.ini index 26a535f28..33e98b043 100644 --- a/tox.ini +++ b/tox.ini @@ -37,9 +37,9 @@ commands = perf: {envpython} {toxinidir}/jsonschema/benchmarks/issue232.py --inherit-environ JSON_SCHEMA_TEST_SUITE --output {envtmpdir}/benchmarks/issue232.json perf: {envpython} {toxinidir}/jsonschema/benchmarks/json_schema_test_suite.py --inherit-environ JSON_SCHEMA_TEST_SUITE --output {envtmpdir}/benchmarks/json_schema_test_suite.json - build: {envpython} -m pep517.check {toxinidir} + build: {envpython} -m build {toxinidir} --outdir {envtmpdir}/dist deps = - build: pep517 + build: build perf: pyperf @@ -54,11 +54,11 @@ commands = {envbindir}/bandit --recursive {toxinidir}/jsonschema [testenv:readme] deps = + build docutils - pep517 twine commands = - {envpython} -m pep517.build --out-dir {envtmpdir}/dist {toxinidir} + {envpython} -m build --outdir {envtmpdir}/dist {toxinidir} {envpython} -m twine check {envtmpdir}/dist/* {envbindir}/rst2html5.py --halt=warning {toxinidir}/CHANGELOG.rst /dev/null