PR#3: Update to 0.32.0, no longer needs keyring - rpms/python-wheel

rpms / python-wheel

#3 Update to 0.32.0, no longer needs keyring

Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.

rpms/ churchyard/python-wheel 032 into master

Update to 0.32.0, no longer needs keyring

Miro Hrončok • 5 years ago

03fc6b4

.gitignore

file modified

		`@@ -5,3 +5,4 @@`
		`/wheel-0.30.0a0.tar.gz`
		`/wheel-0.30.0.tar.gz`
		`/wheel-0.31.1.tar.gz`
		`+ /wheel-0.32.0.tar.gz`

python-wheel.spec

file modified

+17 -19

		`@@ -9,8 +9,8 @@`
		`%global python_wheeldir %{_datadir}/python-wheels`

		`Name: python-%{pypi_name}`
		`- Version: 0.31.1`
		`- Release: 3%{?dist}`
		`+ Version: 0.32.0`
		`+ Release: 1%{?dist}`
		`Epoch: 1`
		`Summary: Built-package format for Python`

		`@@ -19,14 +19,13 @@`
		`Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz`
		`BuildArch: noarch`

		`- # Latest version of wheel requires the package keyrings.alt in order for the tests to pass,`
		`- # however it can't be packaged for Fedora as of yet since the code is not licensed,`
		`- # and as a result wheel fails to build from source.`
		`- # Review request of keyrings.alt: https://bugzilla.redhat.com/show_bug.cgi?id=1365794`
		`- # Until the license issue is resolved upstream, this patch is added to revert`
		`- # the commit from wheel, that introduced this dependency.`
		`- # https://bitbucket.org/pypa/wheel/commits/06841295888fdb430abe12aae29da92107e7360a`
		`- Patch0: remove-keyrings.alt-dependency.patch`
		`+ %if ! %{with bootstrap}`
		`+ # several tests compile extensions`
		`+ # those tests are skipped if gcc is not found`
		`+ BuildRequires: gcc`
		`+ %endif`
		`+`
		`+ %{?python_enable_dependency_generator}`

		`%global _description \`
		`A built-package format for Python.\`
		`@@ -44,8 +43,6 @@`
		`BuildRequires: python2-setuptools`
		`%if ! %{with bootstrap}`
		`BuildRequires: python2-pytest`
		`- BuildRequires: python2-pyxdg`
		`- BuildRequires: python2-keyring`
		`%endif`
		`%{?python_provide:%python_provide python2-%{pypi_name}}`

		`@@ -61,8 +58,6 @@`
		`BuildRequires: python3-setuptools`
		`%if %{without bootstrap}`
		`BuildRequires: python3-pytest`
		`- BuildRequires: python3-pyxdg`
		`- BuildRequires: python3-keyring`
		`%endif`
		`%{?python_provide:%python_provide python3-%{pypi_name}}`

		`@@ -82,8 +77,9 @@`

		`%prep`
		`%autosetup -n %{pypi_name}-%{version} -p1`
		`- # remove unneeded shebangs`
		`- sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py`
		`+`
		`+ # Empty files make rpmlint sad`
		`+ test -s wheel/cli/install.py \|\| echo "# empty" > wheel/cli/install.py`


		`%build`
		`@@ -115,7 +111,6 @@`


		`%check`
		`- export LC_ALL=C.UTF-8`
		`rm setup.cfg`
		`%if %{with python2}`
		`PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build`
		`@@ -126,7 +121,7 @@`
		`%if %{with python2}`
		`%files -n python2-%{pypi_name}`
		`%license LICENSE.txt`
		`- %doc CHANGES.txt README.rst`
		`+ %doc README.rst`
		`%{_bindir}/%{pypi_name}`
		`%{_bindir}/%{pypi_name}-2`
		`%{_bindir}/%{pypi_name}-%{python2_version}`
		`@@ -135,7 +130,7 @@`

		`%files -n python3-%{pypi_name}`
		`%license LICENSE.txt`
		`- %doc CHANGES.txt README.rst`
		`+ %doc README.rst`
		`%{_bindir}/%{pypi_name}-3`
		`%{_bindir}/%{pypi_name}-%{python3_version}`
		`%{python3_sitelib}/%{pypi_name}*`
		`@@ -149,6 +144,9 @@`
		`%endif`

		`%changelog`
		`+ * Sun Sep 30 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.32.0-1`
		`+ - Update to 0.32.0`
		`+`
		`* Wed Aug 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.31.1-3`
		`- Create python-wheel-wheel package with the wheel of wheel`

remove-keyrings.alt-dependency.patch

file removed

-27

		`@@ -1,27 +0,0 @@`
		`- diff -uNr wheel-0.31.1.orig/setup.py wheel-0.31.1/setup.py`
		`- --- wheel-0.31.1.orig/setup.py 2018-05-13 19:22:12.000000000 +0200`
		`- +++ wheel-0.31.1/setup.py 2018-07-08 00:32:02.918116087 +0200`
		`- @@ -39,7 +39,7 @@`
		`- packages=find_packages(),`
		`- python_requires=">=2.7, !=3.0., !=3.1., !=3.2., !=3.3.",`
		`- extras_require={`
		`- - 'signatures': ['keyring', 'keyrings.alt'],`
		`- + 'signatures': ['keyring'],`
		`- 'signatures:sys_platform!="win32"': ['pyxdg'],`
		`- 'faster-signatures': ['ed25519ll'],`
		`- 'test': ['pytest >= 3.0.0', 'pytest-cov']`
		`- diff -uNr wheel-0.31.1.orig/wheel/tool/__init__.py wheel-0.31.1/wheel/tool/__init__.py`
		`- --- wheel-0.31.1.orig/wheel/tool/__init__.py 2018-05-13 19:22:12.000000000 +0200`
		`- +++ wheel-0.31.1/wheel/tool/__init__.py 2018-07-08 00:32:21.442263844 +0200`
		`- @@ -33,10 +33,9 @@`
		`- try:`
		`- from ..signatures import keys`
		`- import keyring`
		`- - assert keyring.get_keyring().priority`
		`- except (ImportError, AssertionError):`
		`- raise WheelError(`
		`- - "Install wheel[signatures] (requires keyring, keyrings.alt, pyxdg) for signatures.")`
		`- + "Install wheel[signatures] (requires keyring, pyxdg) for signatures.")`
		`-`
		`- return keys.WheelKeys, keyring`
		`-`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (wheel-0.31.1.tar.gz) = 148e8c9a050a2646f0df5ea4f69be78d6ea076eeec3d24c93a8f40a0882f843931c65b4da69a2de07abe983a345c7963d18e56100bc64f23deffc6e1db84e777`
		`+ SHA512 (wheel-0.32.0.tar.gz) = 02a0263c3ccd5a5d670793ffe8d39478f7ad858ece0f5241e0ec5f885a0a3dcc4348e94c0c0273edf4872c2b525dbb398ccc01b6e1d69bddf93c593dbdff2649`

no initial comment

rebased onto 2f03f7c

5 years ago

churchyard commented 5 years ago

Ready for review.

churchyard commented 5 years ago

@cstratak ?

cstratak commented 5 years ago

Will review as soon as I can.

rebased onto 5055769

5 years ago

cstratak commented 5 years ago

LGTM. SPEC is fine by sanity checking. Also did a scratch build and didn't notice any issues. I would only add a comment to the SPEC file for the reason that a line is added at the wheel/cli/install.py empty file, saying that it's basically for rpmlint, but it's up to you if you'd like to add that.

Merge at will.

rebased onto 03fc6b4

5 years ago

churchyard commented 5 years ago

Changed the comment.

Pull-Request has been merged by churchyard

5 years ago