Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-cryptography for
openSUSE:Factory checked in at 2021-10-25 15:17:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cryptography (Old)
and /work/SRC/openSUSE:Factory/.python-cryptography.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cryptography"
Mon Oct 25 15:17:00 2021 rev:56 rq:924991 version:3.4.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cryptography/python-cryptography.changes
2021-04-27 21:34:21.467953728 +0200
+++
/work/SRC/openSUSE:Factory/.python-cryptography.new.1890/python-cryptography.changes
2021-10-25 15:17:30.493678439 +0200
@@ -1,0 +2,15 @@
+Tue Oct 12 18:54:25 UTC 2021 - Ben Greiner <[email protected]>
+
+- 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 <[email protected]>
+
+- update to 3.4.8
+- keep new rust support disabled for now to avoid new dependencies
+
+-------------------------------------------------------------------
Old:
----
cryptography-3.3.2.tar.gz
cryptography-3.3.2.tar.gz.asc
New:
----
cryptography-3.4.8.tar.gz
cryptography-3.4.8.tar.gz.asc
disable-RustExtension.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cryptography.spec ++++++
--- /var/tmp/diff_new_pack.YE0EAm/_old 2021-10-25 15:17:31.021678769 +0200
+++ /var/tmp/diff_new_pack.YE0EAm/_new 2021-10-25 15:17:31.025678772 +0200
@@ -16,10 +16,12 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without python2
+%{?!python_module:%define python_module() python3-%{**}}
+%define skip_python2 1
+# disabled in order to avoid pulling dependencies -- [email protected]
+%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 @@
# 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}
-BuildRequires: %{python_module cffi >= 1.7}
-BuildRequires: %{python_module cryptography-vectors = %{version}}
+# PATCH-FEATURE-OPENSUSE disable-RustExtension.patch -- disable
setuptools_rust requirement if not building with rust
+Patch3: disable-RustExtension.patch
+BuildRequires: %{python_module cffi >= 1.12}
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module idna >= 2.1}
-BuildRequires: %{python_module pyasn1-modules}
-BuildRequires: %{python_module pytz}
-BuildRequires: %{python_module setuptools >= 11.3}
-BuildRequires: %{python_module six >= 1.4.1}
+BuildRequires: %{python_module setuptools}
+%if %{with rust}
+BuildRequires: %{python_module setuptools_rust}
+%endif
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
+# python-base is not enough, we need the _ssl module
+Requires: python
# SECTION Test requirements
+BuildRequires: %{python_module cryptography-vectors = %{version}}
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}
+BuildRequires: %{python_module pytest > 6.0}
+BuildRequires: %{python_module pytest-subtests}
+BuildRequires: %{python_module pytest-xdist}
+BuildRequires: %{python_module pytz}
# /SECTION
-# python-base is not enough, we need the _ssl module
-Requires: python
-%ifpython2
-Requires: python-enum34
-Requires: python-ipaddress
-%endif
%python_subpackages
%description
@@ -84,11 +73,12 @@
functions.
%prep
-%setup -q -n cryptography-%{version}
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1 -n cryptography-%{version}
%build
+%if ! %{with rust}
+export CRYPTOGRAPHY_DONT_BUILD_RUST=1
+%endif
export CFLAGS="%{optflags} -fno-strict-aliasing"
%python_build
@@ -97,15 +87,19 @@
# 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
-%{python_sitearch}/*
+%doc CONTRIBUTING.rst CHANGELOG.rst README.rst
+%{python_sitearch}/cryptography
+%{python_sitearch}/cryptography-%{version}*-info
%changelog
++++++ cryptography-3.3.2.tar.gz -> cryptography-3.4.8.tar.gz ++++++
++++ 25257 lines of diff (skipped)
++++++ disable-RustExtension.patch ++++++
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",
