From 3c8eb41879533e7b1b98da95d73fc590a8f5e91d Mon Sep 17 00:00:00 2001 From: Mathias Laurin Date: Sat, 11 Nov 2023 15:33:48 +0100 Subject: [PATCH] ci: Update reqs * typing: `os.PathLike[str]` is now recognized in Python 3.8 --- requirements/build.txt | 4 ++-- requirements/docs.txt | 7 +++++-- requirements/tests.txt | 24 ++++++++++++------------ requirements/typing.txt | 2 +- src/mbedtls/_tlsi.py | 8 +------- src/mbedtls/pk.pyi | 7 +------ 6 files changed, 22 insertions(+), 30 deletions(-) diff --git a/requirements/build.txt b/requirements/build.txt index e76c6bc3..ddb601ae 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -6,7 +6,7 @@ # build==1.0.3 click==8.1.7 -cython==3.0.2 +cython==3.0.5 delocate==0.10.4 ; sys_platform == "darwin" importlib-metadata==6.8.0 packaging==23.2 @@ -14,7 +14,7 @@ pip-tools==7.3.0 pyproject-hooks==1.0.0 tomli==2.0.1 typing-extensions==4.8.0 -wheel==0.41.2 +wheel==0.41.3 zipp==3.17.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/docs.txt b/requirements/docs.txt index ec8ffab9..4da2af0a 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -5,16 +5,18 @@ # pip-compile --config=pyproject.toml --no-annotate requirements/docs.in # alabaster==0.7.13 -babel==2.13.0 +babel==2.13.1 certifi==2023.7.22 -charset-normalizer==3.3.0 +charset-normalizer==3.3.2 docutils==0.18.1 idna==3.4 imagesize==1.4.1 +importlib-metadata==6.8.0 jinja2==3.1.2 markupsafe==2.1.3 packaging==23.2 pygments==2.16.1 +pytz==2023.3.post1 requests==2.31.0 snowballstemmer==2.2.0 sphinx==7.1.2 @@ -27,3 +29,4 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 urllib3==2.0.7 +zipp==3.17.0 diff --git a/requirements/tests.txt b/requirements/tests.txt index 19ad773e..33e7227f 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -4,17 +4,17 @@ # # pip-compile --config=pyproject.toml --no-annotate requirements/tests.in # -astroid==3.0.0 -bleach==6.0.0 +astroid==3.0.1 +bleach==6.1.0 cfgv==3.4.0 coverage[toml]==7.3.2 -cython==3.0.2 +cython==3.0.5 dill==0.3.7 distlib==0.3.7 docutils==0.20.1 exceptiongroup==1.1.3 -filelock==3.12.4 -identify==2.5.30 +filelock==3.13.1 +identify==2.5.31 iniconfig==2.0.0 isort==5.12.0 mccabe==0.7.0 @@ -22,21 +22,21 @@ nodeenv==1.8.0 packaging==23.2 platformdirs==3.11.0 pluggy==1.3.0 -pre-commit==3.4.0 +pre-commit==3.5.0 pygments==2.16.1 -pylint==3.0.0 +pylint==3.0.2 pylint-per-file-ignores==1.3.2 -pytest==7.4.2 +pytest==7.4.3 pytest-cov==4.1.0 -pytest-repeat==0.9.2 -pytest-timeout==2.1.0 +pytest-repeat==0.9.3 +pytest-timeout==2.2.0 pyyaml==6.0.1 readme-renderer==41.0 six==1.16.0 tomli==2.0.1 -tomlkit==0.12.1 +tomlkit==0.12.2 typing-extensions==4.8.0 -virtualenv==20.24.5 +virtualenv==20.24.6 webencodings==0.5.1 # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/typing.txt b/requirements/typing.txt index 03cc69f5..f550b332 100644 --- a/requirements/typing.txt +++ b/requirements/typing.txt @@ -4,7 +4,7 @@ # # pip-compile --config=pyproject.toml --no-annotate requirements/typing.in # -mypy==1.5.1 +mypy==1.7.0 mypy-extensions==1.0.0 tomli==2.0.1 typing-extensions==4.8.0 diff --git a/src/mbedtls/_tlsi.py b/src/mbedtls/_tlsi.py index c7a25304..541cde2c 100644 --- a/src/mbedtls/_tlsi.py +++ b/src/mbedtls/_tlsi.py @@ -7,7 +7,6 @@ import enum import os -import sys from dataclasses import dataclass, field from typing import ( Callable, @@ -20,14 +19,9 @@ Union, ) -if sys.version_info < (3, 9): - _PathLike = os.PathLike -else: - _PathLike = os.PathLike[str] - __all__ = ["NextProtocol", "TLSVersion", "DTLSVersion"] -_Path = Union[_PathLike, str] +_Path = Union[os.PathLike[str], str] @enum.unique diff --git a/src/mbedtls/pk.pyi b/src/mbedtls/pk.pyi index 5d790d77..dca21cba 100644 --- a/src/mbedtls/pk.pyi +++ b/src/mbedtls/pk.pyi @@ -24,12 +24,7 @@ if sys.version_info < (3, 8): else: from typing import Final, Literal -if sys.version_info < (3, 9): - _PathLike = os.PathLike -else: - _PathLike = os.PathLike[str] - -_Path = Union[_PathLike, str] +_Path = Union[os.PathLike[str], str] CIPHER_NAME: Final[Sequence[bytes]] = ... _DER = bytes _PEM = str