From 4c597459d280dae72a4b9c817aabf61aeff3feeb87c17f01d0c9d2510b5e36a3 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 16 Mar 2017 14:49:25 +0000 Subject: [PATCH 1/2] Accepting request 480638 from home:tbechtold:branches:devel:languages:python - update to 1.8.1 - Adust Requires and BuildRequires OBS-URL: https://build.opensuse.org/request/show/480638 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cryptography?expand=0&rev=58 --- cryptography-1.7.2.tar.gz | 3 --- cryptography-1.7.2.tar.gz.asc | 10 ---------- cryptography-1.8.1.tar.gz | 3 +++ cryptography-1.8.1.tar.gz.asc | 10 ++++++++++ cryptography_vectors-1.7.2.tar.gz | 3 --- cryptography_vectors-1.7.2.tar.gz.asc | 10 ---------- cryptography_vectors-1.8.1.tar.gz | 3 +++ cryptography_vectors-1.8.1.tar.gz.asc | 10 ++++++++++ python-cryptography.changes | 6 ++++++ python-cryptography.spec | 12 +++++++----- 10 files changed, 39 insertions(+), 31 deletions(-) delete mode 100644 cryptography-1.7.2.tar.gz delete mode 100644 cryptography-1.7.2.tar.gz.asc create mode 100644 cryptography-1.8.1.tar.gz create mode 100644 cryptography-1.8.1.tar.gz.asc delete mode 100644 cryptography_vectors-1.7.2.tar.gz delete mode 100644 cryptography_vectors-1.7.2.tar.gz.asc create mode 100644 cryptography_vectors-1.8.1.tar.gz create mode 100644 cryptography_vectors-1.8.1.tar.gz.asc diff --git a/cryptography-1.7.2.tar.gz b/cryptography-1.7.2.tar.gz deleted file mode 100644 index d2a56b2..0000000 --- a/cryptography-1.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:878cb68b3da3d493ffd68f36db11c29deee623671d3287c3f8d685117ffda9a9 -size 420867 diff --git a/cryptography-1.7.2.tar.gz.asc b/cryptography-1.7.2.tar.gz.asc deleted file mode 100644 index 63ef84d..0000000 --- a/cryptography-1.7.2.tar.gz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABAgAGBQJYi2RNAAoJECNa5fEp+e2Y+sIH/Rke/WAJd/obiZiFTu4+h0Fb -r3F/6OIjhAGuTd0eo1tEh4871JKdlnvKU4VdzvB8Ot0V+zcd9uDv/UeLPViRyj00 -AiiFnDQqSjxek6ugLK7P5/+ZJ9mrMFguN9xIzAyzbo6MSC9eCjCgfdDP35cmmw3Y -Z5uBkzLkjQAq3DvmdWXZK3Ym3nVP4p5t82FhgQ2FhG7EYAY7+lY1druqR/CTnoxY -OBfHH0WMe0/KV2RhkHwoGzExaESqoaJqLZ/TvdV4oyvOz+P+u4zrEAi/1I1mMOWI -7hLz8AJ7LK1g8+vw42rrbYT4Sooh7S97+gtNQVOfBjee0SFUF7H/9dCcC/n7NAc= -=gXxc ------END PGP SIGNATURE----- diff --git a/cryptography-1.8.1.tar.gz b/cryptography-1.8.1.tar.gz new file mode 100644 index 0000000..a57dfbb --- /dev/null +++ b/cryptography-1.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190 +size 423560 diff --git a/cryptography-1.8.1.tar.gz.asc b/cryptography-1.8.1.tar.gz.asc new file mode 100644 index 0000000..569b059 --- /dev/null +++ b/cryptography-1.8.1.tar.gz.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- + +iQEcBAABAgAGBQJYwiTlAAoJECNa5fEp+e2YcxIIAKwwNv7C5G/CaN+08kcx/f1s +M0nL7qiySXriE1VLVOktgZfNusS9OWsY75A/5rpzTw2Uf32rmXz3TYYC1t2UQyLR +DmOa1YYVNK2tEmaQMp2eede8iLFoKIGx5GJOH7CUDo7PiFGyzYkZO9s72PtaokTt +2jGFWfyL/bezk/eDsUbjuYmkk8uaBaVDLgekOvbFzc40CvV1OgSxE2g24q6BnY/4 +mR16TbsPyV9x8p8q/poUG70lVuYvkJoHDa5iqpA68NMfnWPzRYpZgOTagT4jwMtT +spfFcmLecs3i/kv7TlxMO0gF3mCIxclUPTY5BFhCfw+kYAXv87r09DRkXkHj/co= +=MjtV +-----END PGP SIGNATURE----- diff --git a/cryptography_vectors-1.7.2.tar.gz b/cryptography_vectors-1.7.2.tar.gz deleted file mode 100644 index 75c7794..0000000 --- a/cryptography_vectors-1.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4be4eee8a11deee5c2f00e389b49de8ce2642130282d1cd0adffb2f7dbe0acdc -size 26652633 diff --git a/cryptography_vectors-1.7.2.tar.gz.asc b/cryptography_vectors-1.7.2.tar.gz.asc deleted file mode 100644 index 3d2f010..0000000 --- a/cryptography_vectors-1.7.2.tar.gz.asc +++ /dev/null @@ -1,10 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEcBAABAgAGBQJYi2RXAAoJECNa5fEp+e2YsVsIAJXNavFHfPB4RL04xm87Ul9i -+OK9uQSExvP6is909ABvZ9AxJlFaibk2Tw/XO5deoTrSTyikKuRdxAeZNjHIj6rQ -7CJWZeWZ7ILGuxN99sALzClbV+tZ7DG7UJeopcn9hTRUgzsItYHKcRkGGcijL1sC -e1/lV2d7s23GXu/utZorvS3fPvl7sxP94/Cjon4h9TvJS8KLWHSBDJSqaMGPLbHi -6miXUv3H9H66QHIgX1+TRlf4ovrsB3DR8Kb9A0/4kg8dyHgnQdMg3vFibfvh/AVx -qy/WPvXteTlUMK+vL9hkoCQfaH8BwZg4Gr4k2OrFpAuZDUe7zuzZQNpywdsFwLM= -=OMKe ------END PGP SIGNATURE----- diff --git a/cryptography_vectors-1.8.1.tar.gz b/cryptography_vectors-1.8.1.tar.gz new file mode 100644 index 0000000..8a4567d --- /dev/null +++ b/cryptography_vectors-1.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fd61facea08800ca98ac923f6d02f48a7ae6648025b29cdeb51987c1532add6 +size 26653746 diff --git a/cryptography_vectors-1.8.1.tar.gz.asc b/cryptography_vectors-1.8.1.tar.gz.asc new file mode 100644 index 0000000..74c7447 --- /dev/null +++ b/cryptography_vectors-1.8.1.tar.gz.asc @@ -0,0 +1,10 @@ +-----BEGIN PGP SIGNATURE----- + +iQEcBAABAgAGBQJYwiT+AAoJECNa5fEp+e2YgjcIAKzxDiw9WCYvpL3afqA+86pG +924dKdGlrL+VTP8X0x+lt9p7b/zgQuyjz4+M8NhXGm7Py4sShpz1OPMwzY9LDBoW +rXc9MqdYSfeo6zfxIMdvIYr65KTJJPtmZHtIGZc1Z+/M7b+hSiRrAKbQdvblBQf/ +JwgummghWzQ/U+ouJ/4eQJEh9UhfRcfVuQW0Vgyo+pFMFdS61OQafANm7ZDPTDTZ +qfs6/6gKADY4q4CvTMEuN/MRZ11pw2jjS6V+zTL/TVihQpx3QtHdeSEGuzuthUiT +WYv7F6Y+9uQPtkRjLDJUkxcWgB8eFij3Kmfpwrkap+/bZDeGcwBwXK2xtHlQHhg= +=bo9o +-----END PGP SIGNATURE----- diff --git a/python-cryptography.changes b/python-cryptography.changes index bb062f1..d02e519 100644 --- a/python-cryptography.changes +++ b/python-cryptography.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 16 14:13:56 UTC 2017 - tbechtold@suse.com + +- update to 1.8.1 +- Adust Requires and BuildRequires + ------------------------------------------------------------------- Sun Jan 29 14:57:28 UTC 2017 - michael@stroeder.com diff --git a/python-cryptography.spec b/python-cryptography.spec index f67de63..7924646 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -1,7 +1,7 @@ # # spec file for package python-cryptography # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-cryptography -Version: 1.7.2 +Version: 1.8.1 Release: 0 Summary: Python library which exposes cryptographic recipes and primitives License: Apache-2.0 or BSD-3-Clause @@ -33,10 +33,11 @@ Patch1: disable-uneven-sizes-tests.patch BuildRequires: libopenssl-devel BuildRequires: pkg-config -BuildRequires: python-cffi >= 1.1.0 +BuildRequires: python-asn1crypto >= 0.21.0 +BuildRequires: python-cffi >= 1.4.1 BuildRequires: python-devel BuildRequires: python-enum34 -BuildRequires: python-idna >= 2.0 +BuildRequires: python-idna >= 2.1 BuildRequires: python-ipaddress BuildRequires: python-pyasn1-modules BuildRequires: python-setuptools >= 11.3 @@ -55,8 +56,9 @@ BuildRequires: python-pyasn1 >= 0.1.8 BuildRequires: python-pytest BuildRequires: python-virtualenv %requires_eq python-cffi +Requires: python-asn1crypto >= 0.21.0 Requires: python-enum34 -Requires: python-idna >= 2.0 +Requires: python-idna >= 2.1 Requires: python-ipaddress Requires: python-pyasn1 >= 0.1.8 Requires: python-setuptools >= 11.3 From 00ec0fea30e8ed61a9bd32b9e7ccaca010d9abed60af31a531c3470b16334b28 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 30 Mar 2017 14:12:18 +0000 Subject: [PATCH 2/2] Accepting request 483837 from devel:languages:python:singlespec - Switch to singlespec approach OBS-URL: https://build.opensuse.org/request/show/483837 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cryptography?expand=0&rev=59 --- python-cryptography.changes | 5 +++ python-cryptography.spec | 86 +++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 41 deletions(-) diff --git a/python-cryptography.changes b/python-cryptography.changes index d02e519..7b55625 100644 --- a/python-cryptography.changes +++ b/python-cryptography.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 20 20:34:03 UTC 2017 - tbechtold@suse.com + +- Switch to singlespec approach + ------------------------------------------------------------------- Thu Mar 16 14:13:56 UTC 2017 - tbechtold@suse.com diff --git a/python-cryptography.spec b/python-cryptography.spec index 7924646..79efe0d 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -16,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-cryptography Version: 1.8.1 Release: 0 @@ -23,47 +24,48 @@ Summary: Python library which exposes cryptographic recipes and primitive License: Apache-2.0 or BSD-3-Clause Group: Development/Languages/Python Url: https://cryptography.io/en/latest/ -Source0: https://pypi.io/packages/source/c/cryptography/cryptography-%{version}.tar.gz -Source1: https://pypi.io/packages/source/c/cryptography/cryptography-%{version}.tar.gz.asc +Source0: https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz +Source1: https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz.asc Source2: %{name}.keyring -Source3: https://pypi.io/packages/source/c/cryptography_vectors/cryptography_vectors-%{version}.tar.gz -Source4: https://pypi.io/packages/source/c/cryptography_vectors/cryptography_vectors-%{version}.tar.gz.asc +Source3: https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-%{version}.tar.gz +Source4: https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-%{version}.tar.gz.asc # PATCH-FIX-SLE disable-uneven-sizes-tests.patch bnc#944204 Patch1: disable-uneven-sizes-tests.patch - +BuildRequires: %{python_module asn1crypto >= 0.21.0} +BuildRequires: %{python_module cffi >= 1.4.1} +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-rpm-macros +BuildRequires: python2-enum34 +BuildRequires: python2-ipaddress +# SECTION Test requirements +BuildRequires: %{python_module hypothesis} +BuildRequires: %{python_module iso8601} +BuildRequires: %{python_module pretend} +BuildRequires: %{python_module pyasn1 >= 0.1.8} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module virtualenv} +# /SECTION +BuildRequires: fdupes BuildRequires: libopenssl-devel -BuildRequires: pkg-config -BuildRequires: python-asn1crypto >= 0.21.0 -BuildRequires: python-cffi >= 1.4.1 -BuildRequires: python-devel -BuildRequires: python-enum34 -BuildRequires: python-idna >= 2.1 -BuildRequires: python-ipaddress -BuildRequires: python-pyasn1-modules -BuildRequires: python-setuptools >= 11.3 -BuildRequires: python-six >= 1.4.1 -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: libffi43-devel -%else -BuildRequires: python-hypothesis +BuildRequires: pkgconfig BuildRequires: pkgconfig(libffi) -%endif -BuildRequires: python-pytz -# Test requirements -BuildRequires: python-iso8601 -BuildRequires: python-pretend -BuildRequires: python-pyasn1 >= 0.1.8 -BuildRequires: python-pytest -BuildRequires: python-virtualenv -%requires_eq python-cffi Requires: python-asn1crypto >= 0.21.0 -Requires: python-enum34 Requires: python-idna >= 2.1 -Requires: python-ipaddress Requires: python-pyasn1 >= 0.1.8 Requires: python-setuptools >= 11.3 Requires: python-six >= 1.4.1 +%requires_eq python-cffi BuildRoot: %{_tmppath}/%{name}-%{version}-build +%ifpython2 +Requires: python-enum34 +Requires: python-ipaddress +%endif +%python_subpackages %description cryptography is a package designed to expose cryptographic @@ -85,33 +87,35 @@ tar xvzf %{SOURCE3} %patch1 -p1 %build -CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build +export CFLAGS="%{optflags} -fno-strict-aliasing" +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%fdupes %{buildroot}%{_prefix} %check %if 0%{?suse_version} >= 1210 -# this is going to be fun +%{python_expand # this is going to be fun # create virtualenv -virtualenv --system-site-packages TESTROOT -. TESTROOT/bin/activate +$python %{_bindir}/virtualenv --system-site-packages TESTROOT-%{$python_bin_suffix} +. TESTROOT-%{$python_bin_suffix}/bin/activate # install package in virtualenv -python setup.py install +$python setup.py install # install cryptography vectors -(cd cryptography_vectors-%{version} && python setup.py install) +(cd cryptography_vectors-%{version} && $python setup.py install) # run tests with virtualenv'd python # (specify "tests" directory, otherwise py.test discovers tests in virtualenv'd setuptools) -python /usr/bin/py.test tests +$python -m pytest tests # finish deactivate +} %endif -%files +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE LICENSE.APACHE LICENSE.BSD %doc AUTHORS.rst CONTRIBUTING.rst CHANGELOG.rst README.rst -%{python_sitearch}/cryptography/ -%{python_sitearch}/cryptography-%{version}-py%{py_ver}.egg-info/ +%{python_sitearch}/* %changelog