Update to 3.4 (#1925953)
Remove Python 2 support Remove unused python-idna dependency Add Rust support
This commit is contained in:
Christian Heimes
parent
660907b847
commit
bf3babc383
4 changed files with 118 additions and 94 deletions
|
|
@ -1,26 +1,13 @@
|
|||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
# Enable python3 build by default
|
||||
%bcond_without python3
|
||||
%else
|
||||
%bcond_with python3
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 31 || 0%{?rhel} > 7
|
||||
# Disable python2 build by default
|
||||
%bcond_with python2
|
||||
%else
|
||||
%bcond_without python2
|
||||
%endif
|
||||
|
||||
%bcond_without tests
|
||||
|
||||
%{!?python3_pkgversion:%global python3_pkgversion 3}
|
||||
|
||||
%global srcname cryptography
|
||||
%global pyo3_version 0.13.1
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 3.3.1
|
||||
Release: 2%{?dist}
|
||||
Version: 3.4
|
||||
Release: 1%{?dist}
|
||||
Summary: PyCA's cryptography library
|
||||
|
||||
License: ASL 2.0 or BSD
|
||||
|
|
@ -36,31 +23,14 @@ Source2: gpgkey-05FD_9FA1_6CF7_5735_0D91_A560_235A_E5F1_29F9_ED98.gpg
|
|||
BuildRequires: openssl-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: rust-packaging
|
||||
BuildRequires: rust-pyo3+default-devel >= %{pyo3_version}
|
||||
BuildRequires: rust-pyo3+extension-module-devel >= %{pyo3_version}
|
||||
|
||||
%if 0%{?with_python2}
|
||||
BuildRequires: python2-cffi >= 1.7
|
||||
BuildRequires: python2-cryptography-vectors = %{version}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-enum34
|
||||
BuildRequires: python2-idna >= 2.1
|
||||
BuildRequires: python2-ipaddress
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-six >= 1.4.1
|
||||
|
||||
%if %{with tests}
|
||||
BuildRequires: python2-hypothesis >= 1.11.4
|
||||
BuildRequires: python2-iso8601
|
||||
BuildRequires: python2-pretend
|
||||
BuildRequires: python2-pytest >= 3.2.1
|
||||
BuildRequires: python2-pytz
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python%{python3_pkgversion}-cffi >= 1.7
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: python%{python3_pkgversion}-idna >= 2.1
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools-rust >= 0.11.3
|
||||
BuildRequires: python%{python3_pkgversion}-six >= 1.4.1
|
||||
|
||||
%if %{with tests}
|
||||
|
|
@ -71,105 +41,59 @@ BuildRequires: python%{python3_pkgversion}-pretend
|
|||
BuildRequires: python%{python3_pkgversion}-pytest >= 3.2.1
|
||||
BuildRequires: python%{python3_pkgversion}-pytz
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
cryptography is a package designed to expose cryptographic primitives and
|
||||
recipes to Python developers.
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%package -n python2-%{srcname}
|
||||
Summary: PyCA's cryptography library
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%{?python_provide:%python_provide python2-%{srcname}}
|
||||
%else
|
||||
Provides: python-%{srcname}
|
||||
%endif
|
||||
|
||||
Requires: openssl-libs
|
||||
Requires: python2-idna >= 2.1
|
||||
Requires: python2-six >= 1.4.1
|
||||
Requires: python2-cffi >= 1.7
|
||||
Requires: python2-enum34
|
||||
Requires: python2-ipaddress
|
||||
|
||||
%description -n python2-%{srcname}
|
||||
cryptography is a package designed to expose cryptographic primitives and
|
||||
recipes to Python developers.
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python%{python3_pkgversion}-%{srcname}
|
||||
Summary: PyCA's cryptography library
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
|
||||
|
||||
Requires: openssl-libs
|
||||
Requires: python%{python3_pkgversion}-idna >= 2.1
|
||||
Requires: python%{python3_pkgversion}-six >= 1.4.1
|
||||
Requires: python%{python3_pkgversion}-cffi >= 1.7
|
||||
|
||||
%description -n python%{python3_pkgversion}-%{srcname}
|
||||
cryptography is a package designed to expose cryptographic primitives and
|
||||
recipes to Python developers.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%autosetup -p1 -n %{srcname}-%{version}
|
||||
%cargo_prep
|
||||
rm -f src/rust/Cargo.lock
|
||||
|
||||
%build
|
||||
%if 0%{?with_python2}
|
||||
%py2_build
|
||||
%endif
|
||||
%if 0%{?with_python3}
|
||||
export CARGO_NET_OFFLINE=true
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
# Actually other *.c and *.h are appropriate
|
||||
# see https://github.com/pyca/cryptography/issues/1463
|
||||
find . -name .keep -print -delete
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%py2_install
|
||||
%endif
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
%endif
|
||||
|
||||
%check
|
||||
%if %{with tests}
|
||||
%if 0%{?with_python2}
|
||||
# see https://github.com/pyca/cryptography/issues/4885 and
|
||||
# see https://bugzilla.redhat.com/show_bug.cgi?id=1761194 for deselected tests
|
||||
PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} -m pytest -k "not (test_buffer_protocol_alternate_modes or test_dh_parameters_supported or test_load_ecdsa_no_named_curve)"
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest -k "not (test_buffer_protocol_alternate_modes or test_dh_parameters_supported or test_load_ecdsa_no_named_curve)"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%files -n python2-%{srcname}
|
||||
%doc LICENSE LICENSE.APACHE LICENSE.BSD README.rst docs
|
||||
%{python2_sitearch}/%{srcname}
|
||||
%{python2_sitearch}/%{srcname}-%{version}-py*.egg-info
|
||||
%endif
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python%{python3_pkgversion}-%{srcname}
|
||||
%doc README.rst docs
|
||||
%license LICENSE LICENSE.APACHE LICENSE.BSD
|
||||
%{python3_sitearch}/%{srcname}
|
||||
%{python3_sitearch}/%{srcname}-%{version}-py*.egg-info
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Feb 07 2021 Christian Heimes <cheimes@redhat.com> - 3.4-1
|
||||
- Update to 3.4 (#1925953)
|
||||
- Remove Python 2 support
|
||||
- Remove unused python-idna dependency
|
||||
- Add Rust support
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue