From fd776f2a682386dbf99214d9755bcda3c9ca4c486fb133f785ba7aa506b527e1 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven.kowalik@suse.com>
Date: Thu, 30 Jan 2025 01:18:25 +0000
Subject: [PATCH] Accepting request 1241218 from home:ecsos:python

- Update to 25.0.0

python-cryptography is now in version 44 in the repos!

OBS-URL: https://build.opensuse.org/request/show/1241218
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=118
---
 pyopenssl-24.2.1.tar.gz   |  3 ---
 pyopenssl-25.0.0.tar.gz   |  3 +++
 python-pyOpenSSL.changes  |  4 ++--
 python-pyOpenSSL.spec     |  7 ++++---
 skip-networked-test.patch | 24 ++++++++++++------------
 5 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 pyopenssl-24.2.1.tar.gz
 create mode 100644 pyopenssl-25.0.0.tar.gz

diff --git a/pyopenssl-24.2.1.tar.gz b/pyopenssl-24.2.1.tar.gz
deleted file mode 100644
index e34e812..0000000
--- a/pyopenssl-24.2.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4247f0dbe3748d560dcbb2ff3ea01af0f9a1a001ef5f7c4c647956ed8cbf0e95
-size 184323
diff --git a/pyopenssl-25.0.0.tar.gz b/pyopenssl-25.0.0.tar.gz
new file mode 100644
index 0000000..251ef46
--- /dev/null
+++ b/pyopenssl-25.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd2cef799efa3936bb08e8ccb9433a575722b9dd986023f1cabc4ae64e9dac16
+size 179573
diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes
index abace5f..b0d934d 100644
--- a/python-pyOpenSSL.changes
+++ b/python-pyOpenSSL.changes
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87a186b02485c0679365ad5b32cedac388c224ed06a8fe440c060d9f536a22c4
-size 27120
+oid sha256:a3ed52c811737a01b78aa065c18d48dc9e735993b9813ef075d7125d3968dd0e
+size 29802
diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec
index 8a3cfaf..8e3936e 100644
--- a/python-pyOpenSSL.spec
+++ b/python-pyOpenSSL.spec
@@ -26,7 +26,7 @@
 %endif
 %{?sle15_python_module_pythons}
 Name:           python-pyOpenSSL%{psuffix}
-Version:        24.2.1
+Version:        25.0.0
 Release:        0
 Summary:        Python wrapper module around the OpenSSL library
 License:        Apache-2.0
@@ -35,18 +35,19 @@ Source:         https://files.pythonhosted.org/packages/source/p/pyopenssl/pyope
 # PATCH-FIX-UPSTREAM skip-networked-test.patch gh#pyca/pyopenssl#68 mcepl@suse.com
 # Mark tests requiring network access
 Patch0:         skip-networked-test.patch
+BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module cffi}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-cffi
-Requires:       (python-cryptography >= 41.0.5 with python-cryptography < 44)
+Requires:       (python-cryptography >= 41.0.5 with python-cryptography < 45)
 Provides:       pyOpenSSL = %{version}
 Provides:       pyopenssl = %{version}-%release
 %if %{without test}
 BuildArch:      noarch
 %else
-BuildRequires:  %{python_module cryptography >= 41.0.5 with %python-cryptography < 44}
+BuildRequires:  %{python_module cryptography >= 41.0.5 with %python-cryptography < 45}
 BuildRequires:  %{python_module pretend}
 BuildRequires:  %{python_module pyOpenSSL >= %version}
 BuildRequires:  %{python_module pytest >= 3.0.1}
diff --git a/skip-networked-test.patch b/skip-networked-test.patch
index a491498..8f2db65 100644
--- a/skip-networked-test.patch
+++ b/skip-networked-test.patch
@@ -1,29 +1,29 @@
-Index: pyOpenSSL-24.1.0/tests/test_ssl.py
+Index: pyopenssl-25.0.0/tests/test_ssl.py
 ===================================================================
---- pyOpenSSL-24.1.0.orig/tests/test_ssl.py
-+++ pyOpenSSL-24.1.0/tests/test_ssl.py
-@@ -1249,6 +1249,7 @@ class TestContext:
+--- pyopenssl-25.0.0.orig/tests/test_ssl.py
++++ pyopenssl-25.0.0/tests/test_ssl.py
+@@ -1303,6 +1303,7 @@ class TestContext:
          reason="set_default_verify_paths appears not to work on Windows.  "
          "See LP#404343 and LP#404344.",
      )
 +    @pytest.mark.network
-     def test_set_default_verify_paths(self):
+     def test_set_default_verify_paths(self) -> None:
          """
          `Context.set_default_verify_paths` causes the platform-specific CA
-Index: pyOpenSSL-24.1.0/setup.cfg
+Index: pyopenssl-25.0.0/setup.cfg
 ===================================================================
---- pyOpenSSL-24.1.0.orig/setup.cfg
-+++ pyOpenSSL-24.1.0/setup.cfg
+--- pyopenssl-25.0.0.orig/setup.cfg
++++ pyopenssl-25.0.0/setup.cfg
 @@ -11,4 +11,3 @@ doc_files = doc/_build/html
  [egg_info]
  tag_build = 
  tag_date = 0
 -
-Index: pyOpenSSL-24.1.0/pyproject.toml
+Index: pyopenssl-25.0.0/pyproject.toml
 ===================================================================
---- pyOpenSSL-24.1.0.orig/pyproject.toml
-+++ pyOpenSSL-24.1.0/pyproject.toml
-@@ -42,6 +42,9 @@ ignore_missing_imports = true
+--- pyopenssl-25.0.0.orig/pyproject.toml
++++ pyopenssl-25.0.0/pyproject.toml
+@@ -39,6 +39,9 @@ ignore_missing_imports = true
  [tool.pytest.ini_options]
  addopts = "-r s --strict-markers"
  testpaths = ["tests"]