summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2021-07-04 14:47:23 -0400
committerJason R. Coombs <jaraco@jaraco.com>2021-07-04 15:27:48 -0400
commitfccc927c1eeae9f96d3aaee21783baa4c607ab4e (patch)
tree74467ba9604c88b34a25326b0c7cdab0cb1df002
parent2234e88b7b820c40f29d7ddadc182b0f130eaa1d (diff)
parent5a8384e53c59a886f982739c02572732afa76c7f (diff)
downloadpython-setuptools-git-fccc927c1eeae9f96d3aaee21783baa4c607ab4e.tar.gz
Merge https://github.com/jaraco/skeleton
-rw-r--r--.github/workflows/main.yml6
-rw-r--r--pytest.ini8
-rw-r--r--tox.ini3
3 files changed, 14 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 37d65f33..cd1969cf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,11 @@ jobs:
test:
strategy:
matrix:
- python: [3.6, 3.8, 3.9, pypy3]
+ python:
+ - 3.6
+ - 3.9
+ - 3.10.0-alpha - 3.10.99
+ - pypy3
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
diff --git a/pytest.ini b/pytest.ini
index 9aa1b173..307c5533 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -10,6 +10,14 @@ junit_family=xunit2
filterwarnings=
# Fail on warnings
error
+
+ ## upstream
+ # Suppress deprecation warning in flake8
+ ignore:SelectableGroups dict interface is deprecated::flake8
+ # Suppress deprecation warning in pypa/packaging#433
+ ignore:The distutils package is deprecated::packaging.tags
+ ## end upstream
+
# https://github.com/pypa/setuptools/issues/1823
ignore:bdist_wininst command is deprecated
# Suppress this error; unimportant for CI tests
diff --git a/tox.ini b/tox.ini
index 4afe7321..a1b3c16e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,6 @@ skip_install = True
deps =
build
twine>=3
- path
jaraco.develop>=7.1
passenv =
TWINE_PASSWORD
@@ -63,7 +62,7 @@ setenv =
TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
commands =
python -m bootstrap
- python -c "import path; path.Path('dist').rmtree_p()"
+ python -c "import shutil; shutil.rmtree('dist', ignore_errors=True)"
# unset tag_build and tag_date pypa/setuptools#2500
python setup.py egg_info -Db "" saveopts
python -m build