From f60766863e0e19ffe12a2e8f14ef2281464cc009 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 13 Aug 2019 08:48:50 -0500 Subject: [PATCH] Drop python 2. --- python-boto.spec | 91 +++--------------------------------------------- 1 file changed, 4 insertions(+), 87 deletions(-) diff --git a/python-boto.spec b/python-boto.spec index 937bb42..fee4b1d 100644 --- a/python-boto.spec +++ b/python-boto.spec @@ -1,23 +1,7 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -%bcond_without python3 -%bcond_with executables -%else -%bcond_with python3 -%bcond_without executables -%endif - -# Unit tests don't work on python 2.6 -%if 0%{?el6} -%bcond_with unittests -%else -%bcond_without unittests -%endif - - Summary: A simple, lightweight interface to Amazon Web Services Name: python-boto Version: 2.45.0 -Release: 12%{?dist} +Release: 13%{?dist} License: MIT URL: https://github.com/boto/boto Source0: https://pypi.io/packages/source/b/boto/boto-%{version}.tar.gz @@ -63,27 +47,13 @@ Patch9: boto-2.40.0-route53-no-resourcepath.patch # https://github.com/boto/boto/pull/3111 Patch10: boto-2.45.0-modifysubnetattribute.patch -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-six -%if %{with python3} BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-six -%endif # with python3 - -%if %{with unittests} -BuildRequires: python2-httpretty -BuildRequires: python2-mock -BuildRequires: python2-nose -BuildRequires: python2-requests -%if %{with python3} BuildRequires: python3-httpretty BuildRequires: python3-mock BuildRequires: python3-nose BuildRequires: python3-requests -%endif # with python3 -%endif # with unittests BuildArch: noarch @@ -98,28 +68,6 @@ for other public services such as Google Storage in addition to private cloud systems like Eucalyptus, OpenStack and Open Nebula. -%package -n python2-boto -Summary: A simple, lightweight interface to Amazon Web Services - -Requires: python2-requests -Requires: python2-rsa -Requires: python2-six >= 1.7 - -Provides: python-boto = %{version}-%{release} -Obsoletes: python-boto < 2.39 - - -%description -n python2-boto -Boto is a Python package that provides interfaces to Amazon Web Services. -It supports over thirty services, such as S3 (Simple Storage Service), -SQS (Simple Queue Service), and EC2 (Elastic Compute Cloud) via their -REST and Query APIs. The goal of boto is to support the full breadth -and depth of Amazon Web Services. In addition, boto provides support -for other public services such as Google Storage in addition to private -cloud systems like Eucalyptus, OpenStack and Open Nebula. - - -%if %{with python3} %package -n python3-boto Summary: A simple, lightweight interface to Amazon Web Services @@ -136,7 +84,6 @@ REST and Query APIs. The goal of boto is to support the full breadth and depth of Amazon Web Services. In addition, boto provides support for other public services such as Google Storage in addition to private cloud systems like Eucalyptus, OpenStack and Open Nebula. -%endif # with python3 %prep @@ -148,57 +95,27 @@ cp -p %{SOURCE1} . %build -%{__python2} setup.py build -%if %{with python3} %{__python3} setup.py build -%endif # with python3 %install -%if %{with python3} -# Scripts only work with python2 %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_bindir}/* -%endif # with python3 - -%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT - -%if %{without executables} -# Make executables doc files instead -chmod -x $RPM_BUILD_ROOT/%{_bindir}/* -mv $RPM_BUILD_ROOT/%{_bindir} examples -%endif %check -%if %{with unittests} -%{__python2} tests/test.py default -%if %{with python3} %{__python3} tests/test.py default -%endif # with python3 -%endif # with unittests -%files -n python2-boto -%license boto-mit-license.txt -%doc README.rst -%{python2_sitelib}/boto* - -%if %{with executables} -%{_bindir}/* -%else -%doc examples -%endif - - -%if %{with python3} %files -n python3-boto %license boto-mit-license.txt %{python3_sitelib}/boto* -%endif # with python3 %changelog +* Tue Aug 13 2019 Gwyn Ciesla - 2.45.0-13 +- Drop python 2. + * Fri Jul 26 2019 Fedora Release Engineering - 2.45.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild