From 3bd403c8cf36f274e54921e09e9f48a042b9f2d694d7d0f3878b7ed85b7f5d36 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 12 Oct 2022 06:42:45 +0000 Subject: [PATCH] - drop remove-six.patch, rejected by upstream and breaks all dependent projects of botocore OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:aws/python-botocore?expand=0&rev=152 --- python-botocore.changes | 6 ++++++ python-botocore.spec | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/python-botocore.changes b/python-botocore.changes index 065f1d4..6bc0019 100644 --- a/python-botocore.changes +++ b/python-botocore.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 06:42:09 UTC 2022 - Dirk Müller + +- drop remove-six.patch, rejected by upstream and breaks + all dependent projects of botocore + ------------------------------------------------------------------- Tue Oct 11 11:46:31 UTC 2022 - Matej Cepl diff --git a/python-botocore.spec b/python-botocore.spec index 4835ae7..a19e7c8 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -34,9 +34,6 @@ Summary: Python interface for AWS License: Apache-2.0 URL: https://github.com/boto/botocore Source: https://files.pythonhosted.org/packages/source/b/botocore/botocore-%{version}.tar.gz -# PATCH-FIX-UPSTREAM remove-six.patch mcepl@suse.com -# Removes dependency on six. -Patch0: remove-six.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -45,6 +42,7 @@ Requires: python-jmespath >= 0.7.1 Requires: python-python-dateutil < 3.0.0 Requires: python-python-dateutil >= 2.1 Requires: python-requests +Requires: python-six Requires: python-urllib3 < 1.27 Requires: python-urllib3 >= 1.25.4 BuildArch: noarch @@ -60,7 +58,7 @@ BuildRequires: procps A low-level interface to a growing number of Amazon Web Services. %prep -%autosetup -p1 -n botocore-%{version} +%setup -q -n botocore-%{version} # remove bundled cacert.pem rm botocore/cacert.pem @@ -84,7 +82,7 @@ sed -i 's/botocore\.vendored\.//' botocore/*.py tests/functional/*.py tests/inte %check # TODO: Figure out whether integration tests are possible offline # no_bare_six_imports: we "fixed" that above. -%pytest --ignore tests/integration +%pytest --ignore tests/integration -k "not no_bare_six_imports" %endif %if !%{with test}