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

jaraco · Feb 23, 2022 · 86a8db1 · 86a8db1
2 parents 898f269 + 04fe68a
commit 86a8db1
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 34 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -9,6 +9,7 @@ end_of_line = lf
 
 [*.py]
 indent_style = space
+max_line_length = 88
 
 [*.{yml,yaml}]
 indent_style = space

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,11 +7,13 @@ jobs:
     strategy:
       matrix:
         python:
-        - 3.6
+        - 3.7
         - 3.9
-        # fails as lxml doesn't install
-        # - 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
@@ -35,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/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,10 +1,5 @@
 repos:
 - repo: https://github.com/psf/black
-  rev: 20.8b1
+  rev: 22.1.0
   hooks:
   - id: black
-
-- repo: https://github.com/asottile/blacken-docs
-  rev: v1.9.1
-  hooks:
-  - id: blacken-docs
diff --git a/README.rst b/README.rst
@@ -17,7 +17,7 @@
 .. image:: https://readthedocs.org/projects/cssutils/badge/?version=latest
    :target: https://cssutils.readthedocs.io/en/latest/?badge=latest
 
-.. image:: https://img.shields.io/badge/skeleton-2021-informational
+.. image:: https://img.shields.io/badge/skeleton-2022-informational
    :target: https://blog.jaraco.com/skeleton
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -30,3 +30,10 @@
 
 # Be strict about any broken references:
 nitpicky = True
+
+# Include Python intersphinx mapping to prevent failures
+# jaraco/skeleton#51
+extensions += ['sphinx.ext.intersphinx']
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3', None),
+}
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"]
+requires = ["setuptools>=56", "setuptools_scm[toml]>=3.4.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]

diff --git a/pytest.ini b/pytest.ini
@@ -2,6 +2,16 @@
 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
+
+	# shopkeep/pytest-black#55
+	ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
+	ignore:The \(fspath. py.path.local\) argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning
+	ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning
+
+	# tholo/pytest-flake8#83
+	ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
+	ignore:The \(fspath. py.path.local\) argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning
+	ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning
diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,4 @@
 [metadata]
-license_files =
-	COPYING
-	COPYING.LESSER
 name = cssutils
 author = Christof Hoeke
 author_email = c@cthedot.de
@@ -24,10 +21,9 @@ keywords = CSS, Cascading Style Sheets, CSSParser, DOM Level 2 Stylesheets, DOM
 [options]
 packages = find_namespace:
 include_package_data = true
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
 	importlib_metadata; python_version < "3.8"
-setup_requires = setuptools_scm[toml] >= 3.4.1
 
 [options.packages.find]
 exclude =
@@ -42,16 +38,16 @@ exclude =
 [options.extras_require]
 testing =
 	# upstream
-	pytest >= 4.6
+	pytest >= 6
 	pytest-checkdocs >= 2.4
 	pytest-flake8
-	# python_implementation: workaround for jaraco/skeleton#22
-	# python_version: workaround for python/typed_ast#156
-	pytest-black >= 0.3.7; python_implementation != "PyPy" and python_version < "3.10"
+	pytest-black >= 0.3.7; \
+		# workaround for jaraco/skeleton#22
+		python_implementation != "PyPy"
 	pytest-cov
-	# python_implementation: workaround for jaraco/skeleton#22
-	# python_version: workaround for python/typed_ast#156
-	pytest-mypy; python_implementation != "PyPy" and python_version < "3.10"
+	pytest-mypy >= 0.9.1; \
+		# workaround for jaraco/skeleton#22
+		python_implementation != "PyPy"
 	pytest-enabler >= 1.0.1
 
 	# local
@@ -63,7 +59,7 @@ testing =
 docs =
 	# upstream
 	sphinx
-	jaraco.packaging >= 8.2
+	jaraco.packaging >= 9
 	rst.linker >= 1.9
 
 	# local

diff --git a/setup.py b/setup.py
diff --git a/tox.ini b/tox.ini
@@ -26,15 +26,14 @@ skip_install = True
 deps =
 	build
 	twine>=3
-	path
 	jaraco.develop>=7.1
 passenv =
 	TWINE_PASSWORD
 	GITHUB_TOKEN
 setenv =
 	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
 commands =
-	python -c "import path; path.Path('dist').rmtree_p()"
+	python -c "import shutil; shutil.rmtree('dist', ignore_errors=True)"
 	python -m build
 	python -m twine upload dist/*
 	python -m jaraco.develop.create-github-release