Merge https://github.com/jaraco/skeleton

jaraco · Oct 8, 2021 · 5393ee6 · 5393ee6
2 parents 6591fa7 + 5823e9c
commit 5393ee6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,8 +9,11 @@ jobs:
         python:
         - 3.6
         - 3.9
-        - 3.10.0-alpha - 3.10.99
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        - "3.10"
+        platform:
+        - ubuntu-latest
+        - macos-latest
+        - windows-latest
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
@@ -34,7 +37,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install tox
         run: |
           python -m pip install tox

diff --git a/pytest.ini b/pytest.ini
@@ -2,8 +2,6 @@
 norecursedirs=dist build .tox .eggs
 addopts=--doctest-modules
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
-# workaround for warning pytest-dev/pytest#6178
-junit_family=xunit2
 filterwarnings=
 	# Suppress deprecation warning in flake8
 	ignore:SelectableGroups dict interface is deprecated::flake8

diff --git a/setup.cfg b/setup.cfg
@@ -29,7 +29,7 @@ exclude =
 [options.extras_require]
 testing =
 	# upstream
-	pytest >= 4.6
+	pytest >= 6
 	pytest-checkdocs >= 2.4
 	pytest-flake8
 	pytest-black >= 0.3.7; \