diff --git a/no-pytest_benchmark.patch b/no-pytest_benchmark.patch index 8ab851d..3ba477a 100644 --- a/no-pytest_benchmark.patch +++ b/no-pytest_benchmark.patch @@ -1,17 +1,17 @@ -Index: cryptography-44.0.3/pyproject.toml +Index: cryptography-45.0.5/pyproject.toml =================================================================== ---- cryptography-44.0.3.orig/pyproject.toml -+++ cryptography-44.0.3/pyproject.toml +--- cryptography-45.0.5.orig/pyproject.toml ++++ cryptography-45.0.5/pyproject.toml @@ -67,8 +67,6 @@ nox = ["nox >=2024.04.15", "nox[uv] >=20 test = [ - "cryptography_vectors==44.0.3", + "cryptography_vectors==45.0.5", "pytest >=7.4.0", - "pytest-benchmark >=4.0", - "pytest-cov >=2.10.1", "pytest-xdist >=3.5.0", "pretend >=0.7", "certifi >=2024", -@@ -118,7 +116,7 @@ exclude = [ +@@ -129,7 +127,7 @@ exclude = [ ] [tool.pytest.ini_options] @@ -20,17 +20,14 @@ Index: cryptography-44.0.3/pyproject.toml console_output_style = "progress-even-when-capture-no" markers = [ "skip_fips: this test is not executed in FIPS mode", -@@ -140,33 +138,6 @@ module = [ - ] +@@ -150,30 +148,6 @@ strict_bytes = true + module = ["pretend"] ignore_missing_imports = true -[tool.coverage.run] -branch = true -relative_files = true --source = [ -- "cryptography", -- "tests/", --] +-source = ["cryptography", "tests/"] - -[tool.coverage.paths] -source = [ @@ -39,10 +36,7 @@ Index: cryptography-44.0.3/pyproject.toml - "*.nox\\*\\Lib\\site-packages\\cryptography", - "*.nox/pypy/site-packages/cryptography", -] --tests = [ -- "tests/", -- "*tests\\", --] +-tests = ["tests/", "*tests\\"] - -[tool.coverage.report] -exclude_lines = [ @@ -50,14 +44,17 @@ Index: cryptography-44.0.3/pyproject.toml - "@typing.overload", - "if typing.TYPE_CHECKING", -] +- +-[tool.coverage.html] +-show_contexts = true - [tool.ruff] line-length = 79 -Index: cryptography-44.0.3/tests/bench/test_aead.py +Index: cryptography-45.0.5/tests/bench/test_aead.py =================================================================== ---- cryptography-44.0.3.orig/tests/bench/test_aead.py -+++ cryptography-44.0.3/tests/bench/test_aead.py +--- cryptography-45.0.5.orig/tests/bench/test_aead.py ++++ cryptography-45.0.5/tests/bench/test_aead.py @@ -26,84 +26,84 @@ def _aead_supported(cls): not _aead_supported(ChaCha20Poly1305), reason="Requires OpenSSL with ChaCha20Poly1305 support", @@ -163,10 +160,10 @@ Index: cryptography-44.0.3/tests/bench/test_aead.py ct = aes.encrypt(b"\x00" * 12, b"hello world plaintext", None) - benchmark(aes.decrypt, b"\x00" * 12, ct, None) + aes.decrypt(b"\x00" * 12, ct, None) -Index: cryptography-44.0.3/tests/bench/test_ec_load.py +Index: cryptography-45.0.5/tests/bench/test_ec_load.py =================================================================== ---- cryptography-44.0.3.orig/tests/bench/test_ec_load.py -+++ cryptography-44.0.3/tests/bench/test_ec_load.py +--- cryptography-45.0.5.orig/tests/bench/test_ec_load.py ++++ cryptography-45.0.5/tests/bench/test_ec_load.py @@ -5,9 +5,9 @@ from ..hazmat.primitives.fixtures_ec import EC_KEY_SECP256R1 @@ -181,10 +178,10 @@ Index: cryptography-44.0.3/tests/bench/test_ec_load.py - benchmark(EC_KEY_SECP256R1.private_key) +def test_load_ec_private_numbers(): + EC_KEY_SECP256R1.private_key() -Index: cryptography-44.0.3/tests/bench/test_hashes.py +Index: cryptography-45.0.5/tests/bench/test_hashes.py =================================================================== ---- cryptography-44.0.3.orig/tests/bench/test_hashes.py -+++ cryptography-44.0.3/tests/bench/test_hashes.py +--- cryptography-45.0.5.orig/tests/bench/test_hashes.py ++++ cryptography-45.0.5/tests/bench/test_hashes.py @@ -5,10 +5,10 @@ from cryptography.hazmat.primitives import hashes @@ -198,10 +195,10 @@ Index: cryptography-44.0.3/tests/bench/test_hashes.py - benchmark(bench) + bench() -Index: cryptography-44.0.3/tests/bench/test_hmac.py +Index: cryptography-45.0.5/tests/bench/test_hmac.py =================================================================== ---- cryptography-44.0.3.orig/tests/bench/test_hmac.py -+++ cryptography-44.0.3/tests/bench/test_hmac.py +--- cryptography-45.0.5.orig/tests/bench/test_hmac.py ++++ cryptography-45.0.5/tests/bench/test_hmac.py @@ -5,10 +5,10 @@ from cryptography.hazmat.primitives import hashes, hmac @@ -215,10 +212,10 @@ Index: cryptography-44.0.3/tests/bench/test_hmac.py - benchmark(bench) + bench() -Index: cryptography-44.0.3/tests/bench/test_x509.py +Index: cryptography-45.0.5/tests/bench/test_x509.py =================================================================== ---- cryptography-44.0.3.orig/tests/bench/test_x509.py -+++ cryptography-44.0.3/tests/bench/test_x509.py +--- cryptography-45.0.5.orig/tests/bench/test_x509.py ++++ cryptography-45.0.5/tests/bench/test_x509.py @@ -13,40 +13,40 @@ from cryptography import x509 from ..utils import load_vectors_from_file diff --git a/python-cryptography.spec b/python-cryptography.spec index e5af8c0..81e0774 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -128,7 +128,6 @@ rm -v tests/wycheproof/test_chacha20poly1305.py %license LICENSE LICENSE.APACHE LICENSE.BSD %doc CONTRIBUTING.rst CHANGELOG.rst README.rst %{python_sitearch}/cryptography -%{python_sitearch}/rust %{python_sitearch}/cryptography-%{version}.dist-info %endif