Skip to content

Commit

Permalink
requirements: Upgrade reqs
Browse files Browse the repository at this point in the history
 + fix typing after mypy upgrade
  • Loading branch information
Synss committed Jul 15, 2023
1 parent 3c76e1a commit 8eb8a75
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 87 deletions.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# This file is autogenerated by pip-compile with Python 3.7
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking setup.py
#
certifi==2023.5.7
typing-extensions==4.6.2
typing-extensions==4.7.1
14 changes: 6 additions & 8 deletions requirements/build.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
#
# This file is autogenerated by pip-compile with Python 3.7
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking requirements/build.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking requirements/build.in
#
build==0.10.0
click==8.1.3
cython==0.29.35
click==8.1.5
cython==0.29.36
delocate==0.10.4 ; sys_platform == "darwin"
importlib-metadata==6.6.0
packaging==23.1
pip-tools==6.13.0
pip-tools==7.0.0
pyproject-hooks==1.0.0
tomli==2.0.1
typing-extensions==4.6.2
typing-extensions==4.7.1
wheel==0.40.0
zipp==3.15.0

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
23 changes: 11 additions & 12 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
#
# This file is autogenerated by pip-compile with Python 3.7
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking requirements/docs.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking requirements/docs.in
#
alabaster==0.7.13
babel==2.12.1
certifi==2023.5.7
charset-normalizer==3.1.0
charset-normalizer==3.2.0
docutils==0.18.1
idna==3.4
imagesize==1.4.1
importlib-metadata==6.6.0
importlib-metadata==6.8.0
jinja2==3.1.2
markupsafe==2.1.2
markupsafe==2.1.3
packaging==23.1
pygments==2.15.1
pytz==2023.3
requests==2.31.0
snowballstemmer==2.2.0
sphinx==5.3.0
sphinx-rtd-theme==1.2.1
sphinxcontrib-applehelp==1.0.2
sphinx==6.2.1
sphinx-rtd-theme==1.2.2
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-jquery==4.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
typing-extensions==4.6.2
urllib3==2.0.2
zipp==3.15.0
urllib3==2.0.3
zipp==3.16.2
35 changes: 16 additions & 19 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,45 @@
#
# This file is autogenerated by pip-compile with Python 3.7
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking requirements/tests.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking requirements/tests.in
#
astroid==2.15.5
astroid==2.15.6
bleach==6.0.0
cfgv==3.3.1
coverage[toml]==7.2.6
cython==0.29.35
coverage[toml]==7.2.7
cython==0.29.36
dill==0.3.6
distlib==0.3.6
docutils==0.20.1
exceptiongroup==1.1.1
filelock==3.12.0
exceptiongroup==1.1.2
filelock==3.12.2
identify==2.5.24
importlib-metadata==6.6.0
iniconfig==2.0.0
isort==5.11.5
isort==5.12.0
lazy-object-proxy==1.9.0
mccabe==0.7.0
nodeenv==1.8.0
packaging==23.1
platformdirs==3.5.1
pluggy==1.0.0
pre-commit==2.21.0
platformdirs==3.8.1
pluggy==1.2.0
pre-commit==3.3.3
pygments==2.15.1
pylint==2.17.4
pylint-per-file-ignores==1.0.0
pytest==7.3.1
pylint-per-file-ignores==1.2.1
pytest==7.4.0
pytest-cov==4.1.0
pytest-repeat==0.9.1
pytest-timeout==2.1.0
pyyaml==6.0
readme-renderer==37.3
readme-renderer==40.0
six==1.16.0
tomli==2.0.1
tomlkit==0.11.8
typed-ast==1.5.4
typing-extensions==4.6.2
virtualenv==20.23.0
typing-extensions==4.7.1
virtualenv==20.24.0
webencodings==0.5.1
wrapt==1.15.0
zipp==3.15.0

# The following packages are considered to be unsafe in a requirements file:
# setuptools
9 changes: 4 additions & 5 deletions requirements/typing.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.7
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking requirements/typing.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking requirements/typing.in
#
mypy==1.3.0
mypy==1.4.1
mypy-extensions==1.0.0
tomli==2.0.1
typed-ast==1.5.4
typing-extensions==4.6.2
typing-extensions==4.7.1
12 changes: 2 additions & 10 deletions tests/test_md.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ def algorithm_str(self, request: Any) -> str:
def algorithm(self, algorithm_str: str) -> hashlib.Algorithm:
return cast(hashlib.Algorithm, getattr(hashlib, algorithm_str))

@pytest.mark.parametrize(
"repr_",
[repr, str],
ids=lambda f: f.__name__, # type: ignore[no-any-return]
)
@pytest.mark.parametrize("repr_", [repr, str], ids=lambda f: f.__name__)
def test_repr(
self, repr_: Callable[[object], str], algorithm: hashlib.Algorithm
) -> None:
Expand Down Expand Up @@ -161,11 +157,7 @@ def algorithm_str(self, request: Any) -> str:
def algorithm(self, algorithm_str: str) -> hmac.Algorithm:
return cast(hmac.Algorithm, getattr(hmac, algorithm_str))

@pytest.mark.parametrize(
"repr_",
[repr, str],
ids=lambda f: f.__name__, # type: ignore[no-any-return]
)
@pytest.mark.parametrize("repr_", [repr, str], ids=lambda f: f.__name__)
def test_repr(
self, repr_: Callable[[object], str], algorithm: hmac.Algorithm
) -> None:
Expand Down
6 changes: 1 addition & 5 deletions tests/test_mpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ def test_from_int(value: int) -> None:
assert value == mpi


@pytest.mark.parametrize(
"repr_",
[repr, str],
ids=lambda f: f.__name__, # type: ignore[no-any-return]
)
@pytest.mark.parametrize("repr_", [repr, str], ids=lambda f: f.__name__)
def test_repr(repr_: Callable[[object], str]) -> None:
assert isinstance(repr_(MPI(69)), str)

Expand Down
8 changes: 2 additions & 6 deletions tests/test_pk.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,7 @@ def xyz(self, request: Any) -> Tuple[int, int, int]:
def point(self, xyz: Tuple[int, int, int]) -> ECPoint:
return ECPoint(*xyz)

@pytest.mark.parametrize(
"repr_",
[repr, str],
ids=lambda f: f.__name__, # type: ignore[no-any-return]
)
@pytest.mark.parametrize("repr_", [repr, str], ids=lambda f: f.__name__)
def test_repr(
self, repr_: Callable[[object], str], point: ECPoint
) -> None:
Expand Down Expand Up @@ -264,7 +260,7 @@ def test_import_public_key(self, cipher: _CipherType) -> None:
@pytest.mark.parametrize(
"digestmod",
[_get_md_alg(name) for name in hashlib.algorithms_guaranteed],
ids=lambda dm: dm().name, # type: ignore[no-any-return]
ids=lambda dm: dm().name,
)
def test_sign_verify(
self,
Expand Down
18 changes: 3 additions & 15 deletions tests/test_tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,7 @@ def psk_store(self) -> Mapping[str, bytes]:
def proxy(self, psk_store: Mapping[str, bytes]) -> PSKStoreProxy:
return PSKStoreProxy(psk_store)

@pytest.mark.parametrize(
"repr_",
[repr, str],
ids=lambda f: f.__name__, # type: ignore[no-any-return]
)
@pytest.mark.parametrize("repr_", [repr, str], ids=lambda f: f.__name__)
def test_repr(
self, repr_: Callable[[object], str], psk_store: Mapping[str, bytes]
) -> None:
Expand Down Expand Up @@ -262,11 +258,7 @@ def header(
) -> TLSRecordHeader:
return TLSRecordHeader(record_type, version, length)

@pytest.mark.parametrize(
"repr_",
[repr, str],
ids=lambda f: f.__name__, # type: ignore[no-any-return]
)
@pytest.mark.parametrize("repr_", [repr, str], ids=lambda f: f.__name__)
def test_repr(
self,
repr_: Callable[[object], str],
Expand Down Expand Up @@ -310,11 +302,7 @@ class TestTrustStore:
def store(self) -> TrustStore:
return TrustStore.system()

@pytest.mark.parametrize(
"repr_",
[repr, str],
ids=lambda f: f.__name__, # type: ignore[no-any-return]
)
@pytest.mark.parametrize("repr_", [repr, str], ids=lambda f: f.__name__)
def test_repr(
self, repr_: Callable[[object], str], store: TrustStore
) -> None:
Expand Down
6 changes: 1 addition & 5 deletions tests/test_x509.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,7 @@ def cert(self, request: Any) -> Union[CSR, CRT, CRL]:
assert isinstance(request.param, (CSR, CRT, CRL))
return request.param

@pytest.mark.parametrize(
"repr_",
[repr, str],
ids=lambda f: f.__name__, # type: ignore[no-any-return]
)
@pytest.mark.parametrize("repr_", [repr, str], ids=lambda f: f.__name__)
def test_repr(
self, repr_: Callable[[object], str], cert: Union[CSR, CRT, CRL]
) -> None:
Expand Down

0 comments on commit 8eb8a75

Please sign in to comment.