From 37bbcc118840b9bb4f929cb88698c5a368d00f0bb54a27aa6a77c710f39d78b8 Mon Sep 17 00:00:00 2001 From: Priyanka Saggu Date: Mon, 4 Nov 2024 04:48:09 +0000 Subject: [PATCH 1/2] Accepting request 1220471 from home:psaggu:branches:devel:kubic - version update to 30.1.0 * please refer to the changelog at https://github.com/kubernetes-client/python/blob/v30.1.0/CHANGELOG.md#v3010 - remove patch: - kubernetes-client-python-pr2178-assertEqual-py312.patch gh#kubernetes-client/python#2178 - merged upstream and released. OBS-URL: https://build.opensuse.org/request/show/1220471 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/python-kubernetes?expand=0&rev=25 --- kubernetes-28.1.0.tar.gz | 3 --- kubernetes-30.1.0.tar.gz | 3 +++ ...ient-python-pr2178-assertEqual-py312.patch | 22 ----------------- python-kubernetes.changes | 15 ++++++++++++ python-kubernetes.spec | 24 +++++++++++++++---- 5 files changed, 37 insertions(+), 30 deletions(-) delete mode 100644 kubernetes-28.1.0.tar.gz create mode 100644 kubernetes-30.1.0.tar.gz delete mode 100644 kubernetes-client-python-pr2178-assertEqual-py312.patch diff --git a/kubernetes-28.1.0.tar.gz b/kubernetes-28.1.0.tar.gz deleted file mode 100644 index 1eda81b..0000000 --- a/kubernetes-28.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1468069a573430fb1cb5ad22876868f57977930f80a6749405da31cd6086a7e9 -size 817854 diff --git a/kubernetes-30.1.0.tar.gz b/kubernetes-30.1.0.tar.gz new file mode 100644 index 0000000..efac1a3 --- /dev/null +++ b/kubernetes-30.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41e4c77af9f28e7a6c314e3bd06a8c6229ddd787cad684e0ab9f69b498e98ebc +size 887810 diff --git a/kubernetes-client-python-pr2178-assertEqual-py312.patch b/kubernetes-client-python-pr2178-assertEqual-py312.patch deleted file mode 100644 index 7162998..0000000 --- a/kubernetes-client-python-pr2178-assertEqual-py312.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 346e28acab1877906d0d1c817ee16ac6a11a4f8a Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Sat, 13 Jan 2024 22:25:26 +0100 -Subject: [PATCH] Replace deprecated assertEquals call - ---- - kubernetes/base/config/kube_config_test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kubernetes/base/config/kube_config_test.py b/kubernetes/base/config/kube_config_test.py -index b415492032..1c8bbbe64d 100644 ---- a/kubernetes/config/kube_config_test.py -+++ b/kubernetes/config/kube_config_test.py -@@ -1615,7 +1615,7 @@ def test__get_kube_config_loader_file_persist(self): - actual = _get_kube_config_loader(filename=config_file, - persist_config=True) - self.assertTrue(callable(actual._config_persister)) -- self.assertEquals(actual._config_persister.__name__, "save_changes") -+ self.assertEqual(actual._config_persister.__name__, "save_changes") - - def test__get_kube_config_loader_dict_no_persist(self): - expected = FakeConfig(host=TEST_HOST, diff --git a/python-kubernetes.changes b/python-kubernetes.changes index cb927ff..3918cc3 100644 --- a/python-kubernetes.changes +++ b/python-kubernetes.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Nov 4 04:42:43 UTC 2024 - Priyanka Saggu + +- version update to 30.1.0 + * please refer to the changelog at https://github.com/kubernetes-client/python/blob/v30.1.0/CHANGELOG.md#v3010 + +- remove patch: - kubernetes-client-python-pr2178-assertEqual-py312.patch + gh#kubernetes-client/python#2178 - merged upstream and released. + +------------------------------------------------------------------- +Mon Oct 28 13:05:22 UTC 2024 - Priyanka Saggu + +- version update to 29.0.0 + * please refer to the changelog at https://github.com/kubernetes-client/python/blob/v29.0.0/CHANGELOG.md#v2900 + ------------------------------------------------------------------- Thu Sep 26 21:17:01 UTC 2024 - Yogalakshmi Arunachalam diff --git a/python-kubernetes.spec b/python-kubernetes.spec index a85306b..6bc611a 100644 --- a/python-kubernetes.spec +++ b/python-kubernetes.spec @@ -15,21 +15,19 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %{?sle15_python_module_pythons} Name: python-kubernetes -Version: 28.1.0 +Version: 30.1.0 Release: 0 Summary: Kubernetes python client License: Apache-2.0 URL: https://github.com/kubernetes-client/python # Source tar - https://pypi.org/project/kubernetes/#files Source: https://files.pythonhosted.org/packages/source/k/kubernetes/kubernetes-%{version}.tar.gz -# PATCH-FIX-UPSTREAM kubernetes-client-python-pr2178-assertEqual-py312.patch gh#kubernetes-client/python#2178 -Patch0: kubernetes-client-python-pr2178-assertEqual-py312.patch BuildRequires: %{python_module PyYAML >= 5.4.1} BuildRequires: %{python_module certifi >= 14.05.14} BuildRequires: %{python_module google-auth >= 1.0.1} -BuildRequires: %{python_module oauthlib >= 3.2.2} BuildRequires: %{python_module pip} BuildRequires: %{python_module python-dateutil >= 2.5.3} BuildRequires: %{python_module requests-oauthlib} @@ -46,11 +44,15 @@ BuildRequires: %{python_module Sphinx >= 1.4} BuildRequires: %{python_module pluggy >= 0.3.1} BuildRequires: %{python_module pytest} BuildRequires: %{python_module recommonmark} +%if 0%{?sle_version} && 0%{?sle_version} > 150400 +# Build python-kubernetes with oauthlib >=3.2.2, for sle_version > SLE-15-SP4 +BuildRequires: %{python_module oauthlib >= 3.2.2} # /SECTION +Requires: python-oauthlib >= 3.2.2 +%endif Requires: python-PyYAML >= 5.4.1 Requires: python-certifi >= 14.05.14 Requires: python-google-auth >= 1.0.1 -Requires: python-oauthlib >= 3.2.2 Requires: python-python-dateutil >= 2.5.3 Requires: python-requests Requires: python-requests-oauthlib @@ -67,10 +69,18 @@ Python client for kubernetes http://kubernetes.io/ %autosetup -p1 -n kubernetes-%{version} %build +%if 0%{?sle_version} && 0%{?sle_version} >= 150500 %pyproject_wheel +%else +%python_build +%endif %install +%if 0%{?sle_version} && 0%{?sle_version} >= 150500 %pyproject_install +%else +%python_install +%endif %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -84,6 +94,10 @@ rm kubernetes/dynamic/test_discovery.py %license LICENSE %doc README.md CHANGELOG.md %{python_sitelib}/kubernetes +%if 0%{?sle_version} && 0%{?sle_version} >= 150500 %{python_sitelib}/kubernetes-%{version}.dist-info +%else +%{python_sitelib}/kubernetes-%{version}*-info +%endif %changelog From 1979a817ea58ec48a1420facedfe33b0c70b8d2c216343b076258fcac238c571 Mon Sep 17 00:00:00 2001 From: Priyanka Saggu Date: Tue, 5 Nov 2024 07:10:34 +0000 Subject: [PATCH 2/2] Accepting request 1220795 from home:psaggu:branches:devel:kubic - version update to 30.1.0 * please refer to the changelog at https://github.com/kubernetes-client/python/blob/v30.1.0/CHANGELOG.md#v3010 - remove patch: - kubernetes-client-python-pr2178-assertEqual-py312.patch gh#kubernetes-client/python#2178 - merged upstream and released. - Fix formatting of if/else conditional blocks for build/install section OBS-URL: https://build.opensuse.org/request/show/1220795 OBS-URL: https://build.opensuse.org/package/show/devel:kubic/python-kubernetes?expand=0&rev=26 --- python-kubernetes.changes | 2 +- python-kubernetes.spec | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/python-kubernetes.changes b/python-kubernetes.changes index 3918cc3..b8ca212 100644 --- a/python-kubernetes.changes +++ b/python-kubernetes.changes @@ -16,7 +16,7 @@ Mon Oct 28 13:05:22 UTC 2024 - Priyanka Saggu ------------------------------------------------------------------- Thu Sep 26 21:17:01 UTC 2024 - Yogalakshmi Arunachalam -- Fixed %{?sle15_python_module_pythons} +- Fixed %{?sle15_python_module_pythons}, jsc#PED-8481 ------------------------------------------------------------------- Thu Jan 18 19:52:07 UTC 2024 - Ben Greiner diff --git a/python-kubernetes.spec b/python-kubernetes.spec index 6bc611a..188e0fa 100644 --- a/python-kubernetes.spec +++ b/python-kubernetes.spec @@ -70,13 +70,19 @@ Python client for kubernetes http://kubernetes.io/ %build %if 0%{?sle_version} && 0%{?sle_version} >= 150500 +%bcond_without pyproject +%else +%bcond_with pyproject +%endif + +%if %{with pyproject} %pyproject_wheel %else %python_build %endif %install -%if 0%{?sle_version} && 0%{?sle_version} >= 150500 +%if %{with pyproject} %pyproject_install %else %python_install @@ -94,10 +100,6 @@ rm kubernetes/dynamic/test_discovery.py %license LICENSE %doc README.md CHANGELOG.md %{python_sitelib}/kubernetes -%if 0%{?sle_version} && 0%{?sle_version} >= 150500 -%{python_sitelib}/kubernetes-%{version}.dist-info -%else %{python_sitelib}/kubernetes-%{version}*-info -%endif %changelog