Accepting request 924991 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/924991
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cryptography?expand=0&rev=56

cryptography-3.3.2.tar.gz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEBf2foWz3VzUNkaVgI1rl8Sn57ZgFAmAgGngACgkQI1rl8Sn5
-7Zjfdwf8CO3jtW3dYS0sXDMQ1n300gUWW6y90xPj5elUfpG6YDREa+PDioo7CSzU
-Xb+ldbBqJPaD7aF5MJ3cEp67WcQ6qW5MqkcrRcTlZkA3EqQqIIFf66jYGf63u5kC
-QXTuU0hVx/JhqXYU8/LOja9lQ0SZirACYVR7pa3wFnJKaQeG0WLuT2ky9+UDW8nI
-zxuAz/ysLgmlfLE60rUR53nVIu05m2AOQYWNjaWAagwYa72Hqztksot4wNFhAiUu
-oe7yrbl7iEGkwzCAYWCl6HtSWIoXiQxUXOejzJVhyyOiubWFdDpWrflWUCZJdx2S
-Dze+PGSBjOUEFW/KFU+mGK3evyImdQ==
-=RmGY
------END PGP SIGNATURE-----

cryptography-3.4.8.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c
+size 546907

cryptography-3.4.8.tar.gz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEBf2foWz3VzUNkaVgI1rl8Sn57ZgFAmElKd0ACgkQI1rl8Sn5
+7Zj4mwf6AoZkFckXshuEY9KYUNAd6rrt/J7MKvTXya3zxdH1nCvj+e9VMa3ariCt
+/VZ1f7YEM/brN2YnVe9uN+x1CE5Kt9pL2RANXg6AuT0KWwP2FA7e8alSkG7eHfyv
+zvWfCb8C7IhcoiVGByGF55vRxDQ02n+6/AikBlxQ+3hjQc9HMvjf74SJEhdiCCnu
+D+PHmHuTu1aYw04MzTzhN3UQQewjzttX8xVYpD8nF/N9IxlEZHIAiyiSLUQ44SNR
+S8zbkEHe0yQTx8t39w7Hr0yyFTBW9uNsnyc6+HV9+m3FsAsgVd6ZmpM5JH9vKrYb
+tp8A0Tv5mX5Di0u5ZGjDjjdp+ZeLoQ==
+=aP3q
+-----END PGP SIGNATURE-----

disable-RustExtension.patch

@@ -0,0 +1,49 @@
+Index: cryptography-3.4.8/setup.py
+===================================================================
+--- cryptography-3.4.8.orig/setup.py
++++ cryptography-3.4.8/setup.py
+@@ -13,18 +13,9 @@ from setuptools import find_packages, se
+ try:
+     from setuptools_rust import RustExtension
+ except ImportError:
+-    print(
+-        """
+-        =============================DEBUG ASSISTANCE==========================
+-        If you are seeing an error here please try the following to
+-        successfully install cryptography:
+-
+-        Upgrade to the latest pip and try again. This will fix errors for most
+-        users. See: https://pip.pypa.io/en/stable/installing/#upgrading-pip
+-        =============================DEBUG ASSISTANCE==========================
+-        """
+-    )
+-    raise
++    print("Could not find setuptools_rust."
++          "Set CRYPTOGRAPHY_DONT_BUILD_RUST in order to not build with Rust")
++    RustExtension = None
+ 
+ 
+ base_dir = os.path.dirname(__file__)
+@@ -41,9 +32,9 @@ with open(os.path.join(src_dir, "cryptog
+ 
+ # `install_requirements` and `setup_requirements` must be kept in sync with
+ # `pyproject.toml`
+-setuptools_rust = "setuptools-rust>=0.11.4"
++setuptools_rust = ["setuptools-rust>=0.11.4"] if RustExtension else []
+ install_requirements = ["cffi>=1.12"]
+-setup_requirements = install_requirements + [setuptools_rust]
++setup_requirements = install_requirements + setuptools_rust
+ 
+ if os.environ.get("CRYPTOGRAPHY_DONT_BUILD_RUST"):
+     rust_extensions = []
+@@ -129,9 +120,7 @@ try:
+                 "twine >= 1.12.0",
+                 "sphinxcontrib-spelling >= 4.0.1",
+             ],
+-            "sdist": [
+-                setuptools_rust,
+-            ],
++            "sdist": setuptools_rust,
+             "pep8test": [
+                 "black",
+                 "flake8",

python-cryptography.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Oct 12 18:54:25 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Add disable-RustExtension.patch in order to avoid a build
+  requirement setuptools_rust
+- Next version (35.0) needs a full Rust toolchain.
+- Clean runtime, build and test requirements
+- Disable python2 build: Not supported anymore
+
+-------------------------------------------------------------------
+Mon Oct  4 07:00:30 UTC 2021 - Adrian Schröter <adrian@suse.de>
+
+- update to 3.4.8
+- keep new rust support disabled for now to avoid new dependencies
+
 -------------------------------------------------------------------
 Mon Apr 26 10:07:08 UTC 2021 - Matej Cepl <mcepl@suse.com>
 

python-cryptography.spec

@@ -16,10 +16,12 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?!python_module:%define python_module() python3-%{**}}
-%bcond_without python2
+%define skip_python2 1
+# disabled in order to avoid pulling dependencies -- adrian@suse.de
+%bcond_with rust
 Name:           python-cryptography
-Version:        3.3.2
+Version:        3.4.8
 Release:        0
 Summary:        Python library which exposes cryptographic recipes and primitives
 License:        Apache-2.0 OR BSD-3-Clause
@@ -31,45 +33,32 @@ Source2:        %{name}.keyring
 # PATCH-FIX-SLE disable-uneven-sizes-tests.patch bnc#944204
 Patch1:         disable-uneven-sizes-tests.patch
 Patch2:         skip_openssl_memleak_test.patch
-BuildRequires:  %{python_module asn1crypto >= 0.21.0}
+# PATCH-FEATURE-OPENSUSE disable-RustExtension.patch -- disable setuptools_rust requirement if not building with rust
-BuildRequires:  %{python_module cffi >= 1.7}
+Patch3:         disable-RustExtension.patch
-BuildRequires:  %{python_module cryptography-vectors = %{version}}
+BuildRequires:  %{python_module cffi >= 1.12}
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module idna >= 2.1}
+BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module pyasn1-modules}
+%if %{with rust}
-BuildRequires:  %{python_module pytz}
+BuildRequires:  %{python_module setuptools_rust}
-BuildRequires:  %{python_module setuptools >= 11.3}
+%endif
-BuildRequires:  %{python_module six >= 1.4.1}
 BuildRequires:  fdupes
 BuildRequires:  libopenssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
 BuildRequires:  pkgconfig(libffi)
-Requires:       python-asn1crypto >= 0.21.0
-Recommends:     python-idna >= 2.1
-Requires:       python-packaging
-Requires:       python-pyasn1 >= 0.1.8
-Requires:       python-setuptools >= 11.3
-Requires:       python-six >= 1.4.1
 %requires_eq    python-cffi
-%if %{with python2}
-BuildRequires:  python2-enum34
-BuildRequires:  python2-ipaddress
-%endif
-# SECTION Test requirements
-BuildRequires:  %{python_module hypothesis >= 1.11.4}
-BuildRequires:  %{python_module iso8601}
-BuildRequires:  %{python_module packaging}
-BuildRequires:  %{python_module pretend}
-BuildRequires:  %{python_module pyasn1 >= 0.1.8}
-BuildRequires:  %{python_module pytest > 3.3.0}
-# /SECTION
 # python-base is not enough, we need the _ssl module
 Requires:       python
-%ifpython2
+# SECTION Test requirements
-Requires:       python-enum34
+BuildRequires:  %{python_module cryptography-vectors = %{version}}
-Requires:       python-ipaddress
+BuildRequires:  %{python_module hypothesis >= 1.11.4}
-%endif
+BuildRequires:  %{python_module iso8601}
+BuildRequires:  %{python_module pretend}
+BuildRequires:  %{python_module pytest > 6.0}
+BuildRequires:  %{python_module pytest-subtests}
+BuildRequires:  %{python_module pytest-xdist}
+BuildRequires:  %{python_module pytz}
+# /SECTION
 %python_subpackages
 
 %description
@@ -84,11 +73,12 @@ symmetric ciphers, message digests and key derivation
 functions.
 
 %prep
-%setup -q -n cryptography-%{version}
+%autosetup -p1 -n cryptography-%{version}
-%patch1 -p1
-%patch2 -p1
 
 %build
+%if ! %{with rust}
+export CRYPTOGRAPHY_DONT_BUILD_RUST=1
+%endif
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 %python_build
 
@@ -97,15 +87,19 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 # see https://github.com/pyca/cryptography/issues/1463
 find . -name .keep -print -delete
 
+%if ! %{with rust}
+export CRYPTOGRAPHY_DONT_BUILD_RUST=1
+%endif
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
-%pytest_arch
+%pytest_arch -n auto
 
 %files %{python_files}
 %license LICENSE LICENSE.APACHE LICENSE.BSD
-%doc AUTHORS.rst CONTRIBUTING.rst CHANGELOG.rst README.rst
+%doc CONTRIBUTING.rst CHANGELOG.rst README.rst
-%{python_sitearch}/*
+%{python_sitearch}/cryptography
+%{python_sitearch}/cryptography-%{version}*-info
 
 %changelog