From fcc278d5b00019f500ca57feda3a79c3ad696859 Mon Sep 17 00:00:00 2001 From: Robby Callicotte Date: Aug 30 2022 19:03:05 +0000 Subject: Removed requirement for python-requests 2.26 --- diff --git a/001-requests-chardet-unbundled.patch b/001-requests-chardet-unbundled.patch new file mode 100644 index 0000000..fe08531 --- /dev/null +++ b/001-requests-chardet-unbundled.patch @@ -0,0 +1,14 @@ +diff -up apache-libcloud-3.6.0/setup.py_fix apache-libcloud-3.6.0/setup.py +--- apache-libcloud-3.6.0/setup.py_fix 2022-08-30 09:50:08.320126519 -0500 ++++ apache-libcloud-3.6.0/setup.py 2022-08-30 09:50:52.139549915 -0500 +@@ -189,10 +189,7 @@ SUPPORTED_VERSIONS = ["PyPy 3.6+", "Pyth + # setuptools >= 36.2 + # For installation, minimum required pip version is 1.4 + # Reference: https://hynek.me/articles/conditional-python-dependencies/ +-# We rely on >= 2.26.0 to avoid issues with LGPL transitive dependency +-# See https://github.com/apache/libcloud/issues/1594 for more context + INSTALL_REQUIREMENTS = [] +-INSTALL_REQUIREMENTS.append("requests>=2.26.0") + + + setuptools_version = tuple(setuptools.__version__.split(".")[0:2]) diff --git a/python-libcloud.spec b/python-libcloud.spec index d409cc6..bb99ebe 100644 --- a/python-libcloud.spec +++ b/python-libcloud.spec @@ -12,17 +12,21 @@ any of the services that it supports.} Name: python-%{shortname} Version: 3.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Python library to address multiple cloud provider APIs License: ASL 2.0 URL: http://libcloud.apache.org/ Source0: %{pypi_source} +BuildArch: noarch # This is a downstream only patch persuant to # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters Patch0: 000-remove-linter-deps.patch -BuildArch: noarch + +# https://issues.apache.org/jira/browse/LEGAL-572 +# Removing version restriction on python-requests +%{?el9:Patch1: 001-requests-chardet-unbundled.patch} %description %{_description} @@ -70,6 +74,9 @@ chmod -x demos/gce_demo.py demos/compute_demo.py %changelog +* Tue Aug 30 2022 Robby Callicotte - 3.6.0-3 +- Removed python-requests 2.26 requirement for epel9 build + * Fri Aug 26 2022 Robby Callicotte - 3.6.0-2 - Fixed typo in specfile