From 6d88b44ce6a8d34ed0464b64ed9305066ac06ee6 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Oct 04 2018 14:47:36 +0000 Subject: Drop python2 subpackages (#1627391) --- diff --git a/atomic-reactor.spec b/atomic-reactor.spec index 0e1d8ce..75de136 100644 --- a/atomic-reactor.spec +++ b/atomic-reactor.spec @@ -1,28 +1,3 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?python2_version: %global python2_version %(%{__python2} -c "import sys; sys.stdout.write(sys.version[:3])")} -%endif - -%if 0%{?rhel} && 0%{?rhel} <= 7 -%{!?py2_build: %global py2_build %{__python2} setup.py build} -%{!?py2_install: %global py2_install %{__python2} setup.py install --skip-build --root %{buildroot}} -%endif - -%if (0%{?fedora} >= 22 || 0%{?rhel} >= 8) -%global with_python3 1 -%global binaries_py_version %{python3_version} -%else -%global binaries_py_version %{python2_version} -%endif - -%if (0%{?fedora} < 28) -# tests are failing in f28 with new version of pytest -# rhel/epel has no flexmock, pytest-capturelog -%global with_check 1 -%endif - %global owner projectatomic %global project atomic-reactor @@ -33,10 +8,9 @@ Name: %{project} Version: 1.6.34 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Improved builder for Docker images -Group: Development/Tools License: BSD URL: https://github.com/%{owner}/%{project} Source0: https://github.com/%{owner}/%{project}/archive/%{commit}/%{project}-%{commit}.tar.gz @@ -50,33 +24,9 @@ Patch1: atomic-reactor-1.6.34-pdc-removal.patch Patch2: atomic-reactor-1.6.34-koji-archives.patch BuildArch: noarch - -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%if 0%{?with_check} -BuildRequires: python2-pytest -BuildRequires: python2-pytest-capturelog -BuildRequires: python2-dockerfile-parse >= 0.0.5 -BuildRequires: python2-docker -BuildRequires: python2-flexmock >= 0.10.2 -BuildRequires: python2-six -BuildRequires: python2-osbs-client >= 0.45 -BuildRequires: python2-backports-lzma -BuildRequires: python2-responses -BuildRequires: python2-jsonschema -BuildRequires: python2-pyyaml -BuildRequires: python2-mock -BuildRequires: python2-docker-squash >= 1.0.0-0.3 -%endif # with_check - -%if 0%{?with_python3} Requires: python3-atomic-reactor = %{version}-%{release} -%else -Requires: python2-atomic-reactor = %{version}-%{release} -%endif # with_python3 Requires: git >= 1.7.10 -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools %if 0%{?with_check} @@ -93,7 +43,6 @@ BuildRequires: python3-PyYAML BuildRequires: python3-mock BuildRequires: python3-docker-squash >= 1.0.0-0.3 %endif # with_check -%endif # with_python3 Provides: dock = %{version}-%{release} Obsoletes: dock < %{dock_obsolete_vr} @@ -105,77 +54,8 @@ probably implement if you started hooking Docker into your infrastructure. -%package -n python2-atomic-reactor -%{?python_provide:%python_provide python2-atomic-reactor} -%{?python_provide:%python_provide python-atomic-reactor} -Summary: Python 2 Atomic Reactor library -Group: Development/Tools -License: BSD -Requires: python2-docker -Requires: python2-requests -Requires: python2-setuptools -Requires: python2-dockerfile-parse >= 0.0.5 -Requires: python2-docker-squash >= 1.0.0-0.3 -Requires: python2-backports-lzma -Requires: python2-jsonschema -Requires: python2-pyyaml -Provides: python-dock = %{version}-%{release} -Obsoletes: python-dock < %{dock_obsolete_vr} - -%description -n python2-atomic-reactor -Simple Python 2 library for building Docker images. It contains -a lot of helpful functions which you would probably implement if -you started hooking Docker into your infrastructure. - -%package -n python2-atomic-reactor-koji -%{?python_provide:%python_provide python2-atomic-reactor-koji} -%{?python_provide:%python_provide python-atomic-reactor-koji} -Summary: Koji plugin for Atomic Reactor -Group: Development/Tools -Requires: python2-atomic-reactor = %{version}-%{release} -Requires: koji -Provides: dock-koji = %{version}-%{release} -Provides: python-dock-koji = %{version}-%{release} -Obsoletes: dock-koji < 1.2.0-3 -Obsoletes: python-dock-koji < %{dock_obsolete_vr} - -%description -n python2-atomic-reactor-koji -Koji plugin for Atomic Reactor - - -%package -n python2-atomic-reactor-metadata -%{?python_provide:%python_provide python2-atomic-reactor-metadata} -%{?python_provide:%python_provide python-atomic-reactor-metadata} -Summary: Plugin for submitting metadata to OSBS -Group: Development/Tools -Requires: python2-atomic-reactor = %{version}-%{release} -Requires: osbs -Provides: dock-metadata = %{version}-%{release} -Provides: python-dock-metadata = %{version}-%{release} -Obsoletes: dock-metadata < 1.2.0-3 -Obsoletes: python-dock-metadata < %{dock_obsolete_vr} - -%description -n python2-atomic-reactor-metadata -Plugin for submitting metadata to OSBS - - -%package -n python2-atomic-reactor-rebuilds -%{?python_provide:%python_provide python2-atomic-reactor-rebuilds} -%{?python_provide:%python_provide python-atomic-reactor-rebuilds} -Summary: Plugins for automated rebuilds -Group: Development/Tools -Requires: python2-atomic-reactor = %{version}-%{release} -Requires: osbs >= 0.15 - -%description -n python2-atomic-reactor-rebuilds -Plugins for automated rebuilds - - -%if 0%{?with_python3} %package -n python3-atomic-reactor Summary: Python 3 Atomic Reactor library -Group: Development/Tools -License: BSD Requires: python3-docker Requires: python3-requests Requires: python3-setuptools @@ -195,7 +75,6 @@ you started hooking Docker into your infrastructure. %package -n python3-atomic-reactor-koji Summary: Koji plugin for Atomic Reactor -Group: Development/Tools Requires: python3-atomic-reactor = %{version}-%{release} Requires: koji Provides: python3-dock-koji = %{version}-%{release} @@ -208,7 +87,6 @@ Koji plugin for Atomic Reactor %package -n python3-atomic-reactor-metadata Summary: Plugin for submitting metadata to OSBS -Group: Development/Tools Requires: python3-atomic-reactor = %{version}-%{release} Requires: osbs Provides: python3-dock-metadata = %{version}-%{release} @@ -220,37 +98,22 @@ Plugin for submitting metadata to OSBS %package -n python3-atomic-reactor-rebuilds Summary: Plugins for automated rebuilds -Group: Development/Tools Requires: python3-atomic-reactor = %{version}-%{release} Requires: osbs >= 0.15 %{?python_provide:%python_provide python3-atomic-reactor-rebuilds} %description -n python3-atomic-reactor-rebuilds Plugins for automated rebuilds -%endif # with_python3 %prep %autosetup -p1 -n %{name}-%{commit} %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif # with_python3 - %install -%if 0%{?with_python3} %py3_install -mv %{buildroot}%{_bindir}/atomic-reactor %{buildroot}%{_bindir}/atomic-reactor-%{python3_version} -ln -s %{_bindir}/atomic-reactor-%{python3_version} %{buildroot}%{_bindir}/atomic-reactor-3 -%endif # with_python3 - -%py2_install -mv %{buildroot}%{_bindir}/atomic-reactor %{buildroot}%{_bindir}/atomic-reactor-%{python2_version} -ln -s %{_bindir}/atomic-reactor-%{python2_version} %{buildroot}%{_bindir}/atomic-reactor-2 -ln -s %{_bindir}/atomic-reactor-%{binaries_py_version} %{buildroot}%{_bindir}/atomic-reactor # ship reactor in form of tarball so it can be installed within build image cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/atomic-reactor.tar.gz @@ -261,80 +124,21 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/ %if 0%{?with_check} %check -%if 0%{?with_python3} -LANG=en_US.utf8 py.test-%{python3_version} -vv tests -%endif # with_python3 - -LANG=en_US.utf8 py.test-%{python2_version} -vv tests +%{__python3} -m pytest -vv tests %endif # with_check %files %doc README.md -%{_mandir}/man1/atomic-reactor.1* -%{!?_licensedir:%global license %doc} %license LICENSE %{_bindir}/atomic-reactor - -%files -n python2-atomic-reactor -%doc README.md -%doc docs/*.md -%{!?_licensedir:%global license %doc} -%license LICENSE -%{_bindir}/atomic-reactor-%{python2_version} -%{_bindir}/atomic-reactor-2 -%dir %{python2_sitelib}/atomic_reactor -%{python2_sitelib}/atomic_reactor/*.* -%{python2_sitelib}/atomic_reactor/cli -%{python2_sitelib}/atomic_reactor/plugins -%{python2_sitelib}/atomic_reactor/schemas -%exclude %{python2_sitelib}/atomic_reactor/koji_util.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/exit_koji_promote.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/exit_koji_import.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/exit_sendmail.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/post_import_image.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/pre_add_filesystem.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/pre_bump_release.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/pre_koji.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/pre_koji_parent.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/pre_inject_parent_image.py* -%exclude %{python2_sitelib}/integration-tests - -%{python2_sitelib}/atomic_reactor-%{version}-py2.*.egg-info -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/atomic-reactor.tar.gz -%{_datadir}/%{name}/images - - -%files -n python2-atomic-reactor-koji -%{python2_sitelib}/atomic_reactor/koji_util.py* -%{python2_sitelib}/atomic_reactor/plugins/pre_add_filesystem.py* -%{python2_sitelib}/atomic_reactor/plugins/pre_bump_release.py* -%{python2_sitelib}/atomic_reactor/plugins/pre_koji.py* -%{python2_sitelib}/atomic_reactor/plugins/pre_koji_parent.py* -%{python2_sitelib}/atomic_reactor/plugins/pre_inject_parent_image.py* -%{python2_sitelib}/atomic_reactor/plugins/exit_koji_promote.py* -%{python2_sitelib}/atomic_reactor/plugins/exit_koji_import.py* - - -%files -n python2-atomic-reactor-metadata -%{python2_sitelib}/atomic_reactor/plugins/exit_store_metadata_in_osv3.py* - -%files -n python2-atomic-reactor-rebuilds -%{python2_sitelib}/atomic_reactor/plugins/exit_sendmail.py* -%{python2_sitelib}/atomic_reactor/plugins/post_import_image.py* +%{_mandir}/man1/atomic-reactor.1* -%if 0%{?with_python3} %files -n python3-atomic-reactor %doc README.md %doc docs/*.md -%{!?_licensedir:%global license %doc} %license LICENSE -%{_bindir}/atomic-reactor-%{python3_version} -%{_bindir}/atomic-reactor-3 -%{_mandir}/man1/atomic-reactor.1* %dir %{python3_sitelib}/atomic_reactor %dir %{python3_sitelib}/atomic_reactor/__pycache__ %{python3_sitelib}/atomic_reactor/*.* @@ -364,7 +168,7 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests %exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_check_and_set_rebuild*.py* %exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_koji*.py* %exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_koji_parent*.py* -%exclude %{python2_sitelib}/atomic_reactor/plugins/__pycache__/pre_inject_parent_image.py* +%exclude %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_inject_parent_image.py* %exclude %{python3_sitelib}/integration-tests %{python3_sitelib}/atomic_reactor-%{version}-py3.*.egg-info @@ -407,10 +211,12 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests %{python3_sitelib}/atomic_reactor/plugins/__pycache__/exit_sendmail*.py* %{python3_sitelib}/atomic_reactor/plugins/__pycache__/post_import_image*.py* %{python3_sitelib}/atomic_reactor/plugins/__pycache__/pre_check_and_set_rebuild*.py* -%endif # with_python3 %changelog +* Thu Oct 04 2018 Miro Hrončok - 1.6.34-2 +- Drop python2 subpackages (#1627391) + * Wed Oct 3 2018 Owen Taylor - 1.6.34-1 - Update to 1.6.34 - Add patches to get module information from Koji rather than the PDC,