From a6c40856cb587df45876880e56e4326de69add58 Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Oct 25 2021 06:22:23 +0000 Subject: Update to 18.20.0 Related-to: https://review.rdoproject.org/r/q/Ia531a64cabadfae46ab47e2f8d74e45833461cc0 --- diff --git a/.python-kubernetes.metadata b/.python-kubernetes.metadata index e69de29..32d86f5 100644 --- a/.python-kubernetes.metadata +++ b/.python-kubernetes.metadata @@ -0,0 +1,2 @@ +02b67d685cf145f0751fb51cc62dd9721bd8ea7b SOURCES/v18.20.0.tar.gz +7ca64c42b5c13b957edda47c45a80c2bb1e84669 SOURCES/6b0104ffb9dd2f96d47d075ea3d30f69ea124ce4.tar.gz diff --git a/SPECS/python-kubernetes.spec b/SPECS/python-kubernetes.spec index 4a27ae8..5a06f23 100644 --- a/SPECS/python-kubernetes.spec +++ b/SPECS/python-kubernetes.spec @@ -1,34 +1,12 @@ %{?python_enable_dependency_generator} -%if 0%{?rhel} == 7 -%bcond_with python3 -%bcond_without python2 -%else -%bcond_with python2 -%bcond_without python3 -%endif - -%if 0%{?rhel} == 7 -%global py3 python%{python3_pkgversion} -%global py3dev python%{python3_pkgversion} -Patch0: python-kubernetes-el7.patch -%endif -%if 0%{?rhel} == 8 -%global py3 python3 -%global py3dev python36 -%endif -%if 0%{?fedora} || 0%{?rhel} > 8 -%global py3 python3 -%global py3dev python3 -%endif - %global library kubernetes -%global basehash d30f1e6fd4e2725aae04fa2f4982a4cfec7c682b +%global basehash 6b0104ffb9dd2f96d47d075ea3d30f69ea124ce4 Name: python-%{library} Epoch: 1 -Version: 11.0.0 -Release: 7%{?dist} +Version: 18.20.0 +Release: 1%{?dist} Summary: Python client for the kubernetes API. License: ASL 2.0 URL: https://pypi.python.org/pypi/kubernetes @@ -37,96 +15,37 @@ Source0: https://github.com/kubernetes-client/python/archive/v%{version}.tar. Source1: https://github.com/kubernetes-client/python-base/archive/%{basehash}.tar.gz BuildArch: noarch -%if 0%{?with_python2} -%package -n python2-%{library} -Summary: Kubernetes Python Client -%{?python_provide:%python_provide python2-%{library}} -BuildRequires: git -BuildRequires: python2-devel -BuildRequires: python-setuptools -%if 0%{?rhel} != 7 -Requires: python-adal -%endif -Requires: python-certifi -Requires: python-six -Requires: python-dateutil -Requires: python-setuptools -Requires: python-urllib3 -Requires: PyYAML -Requires: python-google-auth -Requires: python-ipaddress -Requires: python-websocket-client -Requires: python-requests -Requires: python-requests-oauthlib - -%description -n python2-%{library} -Python client for the kubernetes API. - -%package -n python2-%{library}-tests -Summary: Tests python-kubernetes library - -Requires: python-nose -Requires: python-py -Requires: python-mock -Requires: python2-%{library} = 1:%{version}-%{release} - -%description -n python2-%{library}-tests -Tests python-kubernetes library -%endif - -%if 0%{?with_python3} -%package -n %{py3}-%{library} +%package -n python3-%{library} Summary: Kubernetes Python Client BuildRequires: git -BuildRequires: %{py3dev}-devel -BuildRequires: %{py3dev}-rpm-macros -BuildRequires: %{py3}-setuptools +BuildRequires: python3-devel +BuildRequires: python3-rpm-macros +BuildRequires: python3-setuptools %if %{undefined __pythondist_requires} -%if 0%{?fedora} -Requires: %{py3}-adal -%endif -Requires: %{py3}-certifi -Requires: %{py3}-six -Requires: %{py3}-dateutil -Requires: %{py3}-setuptools -Requires: %{py3}-urllib3 -Requires: %{py3}-PyYAML -Requires: %{py3}-google-auth -Requires: %{py3}-websocket-client +Requires: python3-certifi +Requires: python3-six +Requires: python3-dateutil +Requires: python3-setuptools +Requires: python3-urllib3 +Requires: python3-PyYAML +Requires: python3-google-auth +Requires: python3-websocket-client %endif -%description -n %{py3}-%{library} +%description -n python3-%{library} Python client for the kubernetes API. -%package -n %{py3}-%{library}-tests +%package -n python3-%{library}-tests Summary: Tests python-kubernetes library -Requires: %{py3}-nose -Requires: %{py3}-py -Requires: %{py3}-mock -Requires: %{py3}-%{library} = 1:%{version}-%{release} +Requires: python3-nose +Requires: python3-py +Requires: python3-mock +Requires: python3-%{library} = 1:%{version}-%{release} -%description -n %{py3}-%{library}-tests +%description -n python3-%{library}-tests Tests python-kubernetes library -%endif - -#recommonmark not available for docs in EPEL -%if 0%{?fedora} -%package doc -Summary: Documentation for %{name}. -Provides: %{name}-doc = 1:%{version}-%{release} -%if 0%{?with_python3} -BuildRequires: %{py3}-sphinx -BuildRequires: %{py3}-recommonmark -%else -BuildRequires: python2-sphinx -BuildRequires: python2-recommonmark -%endif -%description doc -%{summary} -%endif - %description Python client for the kubernetes API. @@ -140,13 +59,6 @@ Python client for the kubernetes API. sed -i 's/1.24.2/1.23/g' requirements.txt %endif -#BZ1758141 - python autorequires do not handles asterisks properly. -#Fedora is using 0.56.0+ since at least Fedora 31 so this works aorund -#the issue by setting the minimum version above the problem versions. -%if 0%{?fedora} > 30 -sed -i 's/websocket-client.*/websocket-client>=0.43.0/g' requirements.txt -%endif - pushd kubernetes rm -rf base tar zxvf %{SOURCE1} @@ -154,12 +66,7 @@ mv python-base-%{basehash} base popd %build -%if 0%{?with_python2} -%py2_build -%endif -%if 0%{?with_python3} %py3_build -%endif #11.0 adds spinx-markdown-tables as a requirement #It is not packaged in Fedora @@ -178,42 +85,13 @@ popd #rm -rf html/.{doctrees,buildinfo} %install -%if 0%{?with_python2} -%py2_install -cp -pr kubernetes/test %{buildroot}%{python2_sitelib}/%{library}/ -cp -pr kubernetes/e2e_test %{buildroot}%{python2_sitelib}/%{library}/ -%endif -%if 0%{?with_python3} %py3_install cp -pr kubernetes/test %{buildroot}%{python3_sitelib}/%{library}/ cp -pr kubernetes/e2e_test %{buildroot}%{python3_sitelib}/%{library}/ -%endif %check -%if 0%{?with_python2} -%files -n python2-%{library} -%license LICENSE -%doc README.md -%{python2_sitelib}/%{library} -%{python2_sitelib}/%{library}-*.egg-info -%exclude %{python2_sitelib}/%{library}/test -%exclude %{python2_sitelib}/%{library}/e2e_test - -%files -n python2-%{library}-tests -%license LICENSE -%{python2_sitelib}/%{library}/test -%{python2_sitelib}/%{library}/e2e_test -%endif - -%if 0%{?fedora} -%files doc -%license LICENSE -#%doc html -%endif - -%if 0%{?with_python3} -%files -n %{py3}-%{library} +%files -n python3-%{library} %license LICENSE %doc README.md %{python3_sitelib}/%{library} @@ -221,13 +99,22 @@ cp -pr kubernetes/e2e_test %{buildroot}%{python3_sitelib}/%{library}/ %exclude %{python3_sitelib}/%{library}/test %exclude %{python3_sitelib}/%{library}/e2e_test -%files -n %{py3}-%{library}-tests +%files -n python3-%{library}-tests %license LICENSE %{python3_sitelib}/%{library}/test %{python3_sitelib}/%{library}/e2e_test -%endif %changelog +* Fri Aug 20 2021 Jason Montleon - 1:18.20.0-1 +* Update to 18.20.0 + +* Tue Jul 27 2021 Fedora Release Engineering - 1:11.0.0-9 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1:11.0.0-8 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 1:11.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild