PR#26: [DO NOT MERGE] Split python2-setuptools from python-setuptools - rpms/python-setuptools

rpms / python-setuptools

#26 [DO NOT MERGE] Split python2-setuptools from python-setuptools

Closed 4 years ago by churchyard. Opened 4 years ago by churchyard.

rpms/ churchyard/python-setuptools py2 into master

Split python2-setuptools from python-setuptools

Miro Hrončok • 4 years ago

d5dcdcc

create-site-packages.patch

file removed

-17

		`@@ -1,17 +0,0 @@`
		`- diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py`
		`- index 91c48b3..0c9b0f4 100755`
		`- --- a/setuptools/command/easy_install.py`
		`- +++ b/setuptools/command/easy_install.py`
		`- @@ -446,6 +446,12 @@ class easy_install(Command):`
		`- instdir = normalize_path(self.install_dir)`
		`- pth_file = os.path.join(instdir, 'easy-install.pth')`
		`-`
		`- + if not os.path.exists(instdir):`
		`- + try:`
		`- + os.makedirs(instdir)`
		`- + except (OSError, IOError):`
		`- + self.cant_write_to_target()`
		`- +`
		`- # Is it a configured, PYTHONPATH, implicit, or explicit site dir?`
		`- is_site_dir = instdir in self.all_site_dirs`
		`-`

python2-setuptools.spec ~~python-setuptools.spec~~

file renamed

+21 -177

		`@@ -1,25 +1,12 @@`
		`%global srcname setuptools`

		`- # WARNING When bootstrapping, disable tests as well,`
		`- # because tests need pip.`
		`- %bcond_with bootstrap`
		`+ # The tests will be disabled later in Fedora 32 but are kept for now`
		`%bcond_without tests`

		`- %bcond_without python2`
		`-`
		`- %if %{without bootstrap}`
		`- %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl`
		`- %if %{with python2}`
		`- %global python2_record %{python2_sitelib}/%{srcname}-%{version}.dist-info/RECORD`
		`- %endif`
		`- %global python3_record %{python3_sitelib}/%{srcname}-%{version}.dist-info/RECORD`
		`- %endif`
		`- %global python_wheeldir %{_datadir}/python-wheels`
		`-`
		`- Name: python-setuptools`
		`+ Name: python2-setuptools`
		`# When updating, update the bundled libraries versions bellow!`
		`Version: 41.0.1`
		`- Release: 8%{?dist}`
		`+ Release: 9%{?dist}`
		`Summary: Easily build and distribute Python packages`
		`# setuptools is MIT`
		`# packaging is BSD or ASL 2.0`
		`@@ -29,73 +16,28 @@`
		`URL: https://pypi.python.org/pypi/%{srcname}`
		`Source0: %{pypi_source %{srcname} %{version} zip}`

		`- # In Fedora, sudo setup.py install installs to /usr/local/lib/pythonX.Y/site-packages`
		`- # But pythonX doesn't own that dir, that would be against FHS`
		`- # We need to create it if it doesn't exist`
		`- # https://bugzilla.redhat.com/show_bug.cgi?id=1576924`
		`- Patch0: create-site-packages.patch`
		`-`
		`BuildArch: noarch`

		`BuildRequires: gcc`
		`- %if %{with python2}`
		`BuildRequires: python2-devel`
		`- %if %{without bootstrap}`
		`- BuildRequires: python2-pip`
		`- BuildRequires: python2-wheel`
		`- %endif # without bootstrap`
		`+`
		`%if %{with tests}`
		`BuildRequires: python2-futures`
		`BuildRequires: python2-pip`
		`BuildRequires: python2-pytest`
		`BuildRequires: python2-mock`
		`- %endif # with tests`
		`- %endif # with python2`
		`-`
		`- BuildRequires: python3-devel`
		`- %if %{with tests}`
		`- BuildRequires: python3-pip`
		`- BuildRequires: python3-pytest`
		`- BuildRequires: python3-mock`
		`- BuildRequires: python3-pytest-fixture-config`
		`- BuildRequires: python3-pytest-virtualenv`
		`- %endif # with tests`
		`- %if %{without bootstrap}`
		`- BuildRequires: python3-pip`
		`- BuildRequires: python3-wheel`
		`- # python3 bootstrap: this is built before the final build of python3, which`
		`- # adds the dependency on python3-rpm-generators, so we require it manually`
		`- BuildRequires: python3-rpm-generators`
		`- %endif # without bootstrap`
		`-`
		`- %description`
		`- Setuptools is a collection of enhancements to the Python distutils that allow`
		`- you to more easily build and distribute Python packages, especially ones that`
		`- have dependencies on other packages.`
		`-`
		`- This package also contains the runtime components of setuptools, necessary to`
		`- execute the software that requires pkg_resources.py.`
		`+ BuildRequires: python2-wheel`
		`+ %endif`

		`# Virtual provides for the packages bundled by setuptools.`
		`# You can find the versions in setuptools/setuptools/_vendor/vendored.txt`
		`- %global bundled() %{expand:`
		`- Provides: bundled(python%{1}dist(packaging)) = 16.8`
		`- Provides: bundled(python%{1}dist(pyparsing)) = 2.2.1`
		`- Provides: bundled(python%{1}dist(six)) = 1.10.0`
		`- }`
		`-`
		`- %if %{with python2}`
		`- %package -n python2-setuptools`
		`- Summary: Easily build and distribute Python packages`
		`- %{?python_provide:%python_provide python2-setuptools}`
		`- %{bundled 2}`
		`+ Provides: bundled(python2dist(packaging)) = 16.8`
		`+ Provides: bundled(python2dist(pyparsing)) = 2.2.1`
		`+ Provides: bundled(python2dist(six)) = 1.10.0`

		`- %if %{with bootstrap}`
		`- Provides: python2dist(setuptools) = %{version}`
		`- Provides: python%{python2_version}dist(setuptools) = %{version}`
		`- %endif`
		`+ %{?python_provide:%python_provide python2-setuptools}`

		`- %description -n python2-setuptools`
		`+ %description`
		`Setuptools is a collection of enhancements to the Python distutils that allow`
		`you to more easily build and distribute Python packages, especially ones that`
		`have dependencies on other packages.`
		`@@ -103,39 +45,6 @@`
		`This package also contains the runtime components of setuptools, necessary to`
		`execute the software that requires pkg_resources.py.`

		`- %endif # with python2`
		`-`
		`-`
		`- %package -n python3-setuptools`
		`- Summary: Easily build and distribute Python 3 packages`
		`- Conflicts: python-setuptools < %{version}-%{release}`
		`- %{?python_provide:%python_provide python3-setuptools}`
		`- %{bundled 3}`
		`-`
		`- %if %{with bootstrap}`
		`- Provides: python3dist(setuptools) = %{version}`
		`- Provides: python%{python3_version}dist(setuptools) = %{version}`
		`- %endif`
		`-`
		`-`
		`- %description -n python3-setuptools`
		`- Setuptools is a collection of enhancements to the Python 3 distutils that allow`
		`- you to more easily build and distribute Python 3 packages, especially ones that`
		`- have dependencies on other packages.`
		`-`
		`- This package also contains the runtime components of setuptools, necessary to`
		`- execute the software that requires pkg_resources.py.`
		`-`
		`- %if %{without bootstrap}`
		`- %package wheel`
		`- Summary: The setuptools wheel`
		`- %{bundled 2}`
		`- %{bundled 3}`
		`-`
		`- %description wheel`
		`- A Python wheel of setuptools to use with venv.`
		`- %endif`
		`-`

		`%prep`
		`%autosetup -p1 -n %{srcname}-%{version}`
		`@@ -153,112 +62,47 @@`
		`%build`
		`# Warning, different bootstrap meaning here, has nothing to do with our bcond`
		`# This bootstraps .egg-info directory needed to build setuptools`
		`- %{__python3} bootstrap.py`
		`+ %{__python2} bootstrap.py`

		`- %if %{without bootstrap}`
		`- %py3_build_wheel`
		`- %else`
		`- %if %{with python2}`
		`%py2_build`
		`- %endif # with python2`
		`-`
		`- %py3_build`
		`- %endif`


		`%install`
		`- # Must do the python2 install first because the scripts in /usr/bin are`
		`- # overwritten with every setup.py install (and we want /usr/bin/pip to be`
		`- # the python3 version).`
		`- %if %{with python2}`
		`- %if %{without bootstrap}`
		`- %py2_install_wheel %{python_wheelname}`
		`-`
		`- # Remove /usr/bin/easy_install from the record as later on we delete the file`
		`- sed -i '/\/usr\/bin\/easy_install,/d' %{buildroot}%{python2_record}`
		`- %else`
		`%py2_install`
		`- %endif`

		`- # TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to`
		`- # (pip install wheel doesn't overwrite)`
		`rm %{buildroot}%{_bindir}/easy_install`
		`-`
		`rm -rf %{buildroot}%{python2_sitelib}/setuptools/tests`
		`- %if %{without bootstrap}`
		`- sed -i '/^setuptools\/tests\//d' %{buildroot}%{python2_record}`
		`- %endif`

		`find %{buildroot}%{python2_sitelib} -name '*.exe' \| xargs rm -f`
		`- %endif # with python2`
		`-`
		`-`
		`- %if %{without bootstrap}`
		`- %py3_install_wheel %{python_wheelname}`
		`- %else`
		`- %py3_install`
		`- %endif`
		`-`
		`- rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests`
		`- %if %{without bootstrap}`
		`- sed -i '/^setuptools\/tests\//d' %{buildroot}%{python3_record}`
		`- %endif`
		`-`
		`- find %{buildroot}%{python3_sitelib} -name '*.exe' \| xargs rm -f`

		`# Don't ship these`
		`rm -r docs/{Makefile,conf.py,_*}`

		`- %if %{without bootstrap}`
		`- mkdir -p %{buildroot}%{python_wheeldir}`
		`- install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}`
		`- %endif`
		`-`

		`%if %{with tests}`
		`%check`
		`- %if %{with python2}`
		`# see https://github.com/pypa/setuptools/issues/1170 for PYTHONDONTWRITEBYTECODE`
		`# several tests are xfailed with POSIX locale, so we set C.utf-8 (not needed on py3)`
		`# test_virtualenv is ignored to break dependency on python2-pytest-virtualenv`
		`LANG=C.utf-8 PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) pytest-%{python2_version} \`
		`- --ignore setuptools/tests/test_virtualenv.py \`
		`- %endif # with python2`
		`-`
		`- # --ignore=pavement.py: No python3-paver in Fedora (the test is only collected on py3)`
		`- # pavement.py is only used by upstream to do releases and vendoring, we don't ship it`
		`- PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) pytest-%{python3_version} --ignore=pavement.py`
		`- %endif # with tests`
		`+ --ignore setuptools/tests/test_virtualenv.py`
		`+ %endif`


		`- %if %{with python2}`
		`%files -n python2-setuptools`
		`%license LICENSE`
		`%doc docs/* CHANGES.rst README.rst`
		`- %{python2_sitelib}/*`
		`+ %{python2_sitelib}/setuptools-%{version}-py%{python2_version}.egg-info/`
		`+ %{python2_sitelib}/setuptools/`
		`+ %{python2_sitelib}/easy_install*`
		`+ %{python2_sitelib}/pkg_resources/`
		`%{_bindir}/easy_install-2.*`
		`- %endif # with python2`
		`-`
		`- %files -n python3-setuptools`
		`- %license LICENSE`
		`- %doc docs/* CHANGES.rst README.rst`
		`- %{python3_sitelib}/easy_install.py`
		`- %{python3_sitelib}/pkg_resources/`
		`- %{python3_sitelib}/setuptools*/`
		`- %{python3_sitelib}/__pycache__/*`
		`- %{_bindir}/easy_install`
		`- %{_bindir}/easy_install-3.*`
		`-`
		`- %if %{without bootstrap}`
		`- %files wheel`
		`- %license LICENSE`
		`- # we own the dir for simplicity`
		`- %dir %{python_wheeldir}/`
		`- %{python_wheeldir}/%{python_wheelname}`
		`- %endif`


		`%changelog`
		`+ * Mon Aug 26 2019 Miro Hrončok <mhroncok@redhat.com> - 41.0.1-9`
		`+ - Split python2-setuptools from python-setuptools`
		`+`
		`* Sun Aug 18 2019 Miro Hrončok <mhroncok@redhat.com> - 41.0.1-8`
		`- Rebuilt for Python 3.8`