Merge branch 'main' into add-none-support-approxmapping

This commit is contained in:
Kenny Y 2023-07-07 15:55:19 -04:00 committed by GitHub
commit db37e34613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions

View File

@ -8,7 +8,7 @@ repos:
rev: 1.14.0
hooks:
- id: blacken-docs
additional_dependencies: [black==23.1.0]
additional_dependencies: [black==23.3.0]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:

View File

@ -19,7 +19,7 @@ The ``pytest`` framework makes it easy to write small, readable tests, and can
scale to support complex functional testing for applications and libraries.
``pytest`` requires: Python 3.7+ or PyPy3.
``pytest`` requires: Python 3.8+ or PyPy3.
**PyPI package name**: :pypi:`pytest`

View File

@ -113,7 +113,7 @@ template = "changelog/_template.rst"
showcontent = true
[tool.black]
target-version = ['py37']
target-version = ['py38']
# check-wheel-contents is executed by the build-and-inspect-python-package action.
[tool.check-wheel-contents]

View File

@ -1519,9 +1519,9 @@ class TestPOSIXLocalPath:
path1.chown(owner, group)
class TestUnicodePy2Py3:
class TestUnicode:
def test_join_ensure(self, tmpdir, monkeypatch):
if sys.version_info >= (3, 0) and "LANG" not in os.environ:
if "LANG" not in os.environ:
pytest.skip("cannot run test without locale")
x = local(tmpdir.strpath)
part = "hällo"
@ -1529,7 +1529,7 @@ class TestUnicodePy2Py3:
assert x.join(part) == y
def test_listdir(self, tmpdir):
if sys.version_info >= (3, 0) and "LANG" not in os.environ:
if "LANG" not in os.environ:
pytest.skip("cannot run test without locale")
x = local(tmpdir.strpath)
part = "hällo"