PR#4: Use the bundled wheels (setuptools 45 drops Python 2 compatibility) - rpms/jython

rpms / jython

#4 Use the bundled wheels (setuptools 45 drops Python 2 compatibility)

Merged 4 years ago by mbooth. Opened 4 years ago by churchyard.

rpms/ churchyard/jython bundled_wheels into master

Use the bundled wheels (setuptools 45 drops Python 2 compatibility)

Miro Hrončok • 4 years ago

dd81a2c

jython.spec

file modified

+8 -4

		`@@ -6,7 +6,7 @@`

		`Name: jython`
		`Version: 2.7.1`
		`- Release: 10%{?dist}`
		`+ Release: 11%{?dist}`
		`Summary: A Java implementation of the Python language`
		`License: ASL 1.1 and BSD and CNRI and JPython and Python`
		`URL: http://www.jython.org/`
		`@@ -15,7 +15,8 @@`
		`# Those wheels are used for the ensurepip module and are bundled with upstream`
		`# source tarball. We remove them and depend on packages that bring wheels built`
		`# in Fedora. When turned off (set to "with"), bundled wheels are used.`
		`- %bcond_without rpmwheels`
		`+ # Note: With setuptools 45+ in Fedora 33+, we cannot longer use this on Python 2`
		`+ %bcond_with rpmwheels`

		`# Use the included fetch-jython.sh script to generate the source drop`
		`# Usage: sh fetch-jython.sh %%{scm_tag}`
		`@@ -82,9 +83,9 @@`
		`BuildRequires: xerces-j2`

		`%if %{with rpmwheels}`
		`- BuildRequires: python-setuptools-wheel`
		`+ BuildRequires: python-setuptools-wheel < 45`
		`BuildRequires: python-pip-wheel`
		`- Requires: python-setuptools-wheel`
		`+ Requires: python-setuptools-wheel < 45`
		`Requires: python-pip-wheel`
		`%else`
		`Provides: bundled(python2-pip) = 9.0.1`
		`@@ -230,6 +231,9 @@`
		`%{_datadir}/%{name}/Demo`

		`%changelog`
		`+ * Tue Feb 25 2020 Miro Hrončok <mhroncok@redhat.com> - 2.7.1-11`
		`+ - Use the bundled wheels (setuptools 45 drops Python 2 compatibility)`
		`+`
		`* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-10`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild`

churchyard commented 4 years ago

Let me know if I shall do either of the following instead:

add an if Fedora >= 33 around the bcond
drop the bcond and patch entirely

pviktori commented 4 years ago

Smoke-tested in mock: the bundled versions are installed without network access.

churchyard commented 4 years ago

If there is no outcry I plan to merge this sooner than later, before the buildrequires of jython are retired by being orphaned and jython fails to build.