- unconditional noarch subpackages

[packages/python3-cryptography.git] / python-cryptography.spec

diff --git a/python-cryptography.spec b/python-cryptography.spec
index 1fab86958cda34ca247fe599bc11ce16de784a48..6066d5e6645fef5ebbd5aee6abe4f2802cac365d 100644 (file)
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@@ -1,4 +1,3 @@
-# TODO: when updating try to reenable all tests (two were failing in 2.7 with openssl 1.1.1d)
 #
 # Conditional build:
 %bcond_without python2 # CPython 2.x module
@@ -9,33 +8,31 @@
 Summary:       Crypthography library for Python 2
 Summary(pl.UTF-8):     Biblioteka Cryptography dla Pythona 2
 Name:          python-cryptography
-Version:       2.7
-Release:       2
+Version:       3.3.1
+Release:       3
 License:       Apache v2.0 or BSD
 Group:         Libraries/Python
 #Source0Download: https://pypi.org/simple/cryptography/
 Source0:       https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz
-# Source0-md5: 7dfe1035cae43569e571318f000462a4
+# Source0-md5: 6faa1a7125c500c0e1586ad342ba3b30
 #Source1Download: https://pypi.org/simple/cryptography_vectors/
 Source1:       https://files.pythonhosted.org/packages/source/c/cryptography-vectors/cryptography_vectors-%{version}.tar.gz
-# Source1-md5: 1a518a28ed9c924ca6c570aa8ea0c334
+# Source1-md5: 2a23fd073fc1f95a697ee96fc991e419
 URL:           https://cryptography.io/
-BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: openssl-devel >= 1.1.0
 BuildRequires: rpm-pythonprov >= 5.4.15-48
 BuildRequires: rpmbuild(macros) >= 1.714
 %if %{with python2}
-BuildRequires: python-cffi >= 1.8
+BuildRequires: python-cffi >= 1.12
 BuildRequires: python-devel >= 1:2.7
 BuildRequires: python-enum34
 BuildRequires: python-pytz
 BuildRequires: python-setuptools >= 18.5
 BuildRequires: python-six >= 1.4.1
 %if %{with tests}
-BuildRequires: python-asn1crypto >= 0.21.0
 %if "%{py_ver}" >= "2.7"
 BuildRequires: python-hypothesis >= 1.11.4
 %endif
-BuildRequires: python-idna >= 2.1
 BuildRequires: python-ipaddress
 BuildRequires: python-iso8601
 BuildRequires: python-pretend
@@ -44,14 +41,12 @@ BuildRequires:      python-pytz
 %endif
 %endif
 %if %{with python3}
-BuildRequires: python3-cffi >= 1.8
-BuildRequires: python3-devel >= 1:3.4
+BuildRequires: python3-cffi >= 1.12
+BuildRequires: python3-devel >= 1:3.6
 BuildRequires: python3-setuptools >= 18.5
 BuildRequires: python3-six >= 1.4.1
 %if %{with tests}
-BuildRequires: python3-asn1crypto >= 0.21.0
 BuildRequires: python3-hypothesis >= 1.11.4
-BuildRequires: python3-idna >= 2.1
 BuildRequires: python3-iso8601
 BuildRequires: python3-pretend
 BuildRequires: python3-pytest >= 3.6.0
@@ -62,7 +57,7 @@ BuildRequires:        python3-pytz
 BuildRequires: python3-sphinx_rtd_theme
 BuildRequires: sphinx-pdg-3 >= 1.6.5
 %endif
-Requires:      openssl >= 1.0.1
+Requires:      openssl >= 1.1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -94,7 +89,7 @@ Ten pakiet zawiera moduły Pythona 2.
 Summary:       Crypthography library for Python 3
 Summary(pl.UTF-8):     Biblioteka Cryptography dla Pythona 3
 Group:         Libraries/Python
-Requires:      openssl >= 1.0.1
+Requires:      openssl >= 1.1.0
 
 %description -n python3-cryptography
 cryptography is a package designed to expose cryptographic recipes and
@@ -125,9 +120,7 @@ Ten pakiet zawiera moduły Pythona 3.
 Summary:       API documentation for cryptography module
 Summary(pl.UTF-8):     Dokumentacja API modułu cryptography
 Group:         Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 API documentation for cryptography module.
@@ -149,17 +142,17 @@ export CFLAGS="%{rpmcflags}"
 %py_build
 
 %if %{with tests}
-PYTHONPATH=$(pwd) \
-%{__python} -m pytest tests  -k 'not test_dh_parameters_supported and not test_load_ecdsa_no_named_curve'
+PYTHONPATH=$(echo $(pwd)/build-2/lib.*) \
+%{__python} -m pytest tests
 %endif
 %endif
 
-%if %{with python2}
+%if %{with python3}
 %py3_build
 
 %if %{with tests}
-PYTHONPATH=$(pwd) \
-%{__python3} -m pytest tests  -k 'not test_dh_parameters_supported and not test_load_ecdsa_no_named_curve'
+PYTHONPATH=$(echo $(pwd)/build-3/lib.*) \
+%{__python3} -m pytest tests
 %endif
 %endif
 
@@ -268,5 +261,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with doc}
 %files apidocs
 %defattr(644,root,root,755)
-%doc docs/_build/html/{_downloads,_modules,_static,development,hazmat,x509,*.html,*.js}
+%doc docs/_build/html/{_downloads,_static,development,hazmat,x509,*.html,*.js}
 %endif