Accepting request 1318756 from devel:languages:python

- Skip some tests broken by Click 8.3.
- Clean up {Build,}Requires.

OBS-URL: https://build.opensuse.org/request/show/1318756
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-softlayer?expand=0&rev=25

python-softlayer.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Nov 20 03:43:39 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Skip some tests broken by Click 8.3.
+- Clean up {Build,}Requires.
+
+-------------------------------------------------------------------
+Wed Sep 10 12:17:54 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 6.2.7
+  * Migrated away from using Vlan.primaryRouter to find a VLAN's datacenter
+  * #2211 removed CDN commands and created a deprecated message for them
+  * fixed an issue when placing an order doesn't find the correct datacenter
+  * pip prod(deps): bump sphinx from 8.1.3 to 8.2.1
+  * pip prod(deps): bump rich from 13.9.4 to 14.0.0
+  * pip prod(deps): bump sphinx from 8.2.1 to 8.2.3
+  * Improved employee auth to work better on dev servers
+  * Update README-internal.md
+  * Fixed tox errors
+  * Support Click 8.2+
+  * Support for NVMe Dual Raid card ordering
+  * Removed IPSec VPN commands
+  * Updated to v6.2.7
+- Drop support-click-8.2.patch, merged upstream
+
 -------------------------------------------------------------------
 Thu May 22 13:47:48 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
 

python-softlayer.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-softlayer
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,12 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-softlayer
-Version:        6.2.6
+Version:        6.2.7
 Release:        0
 Summary:        A set of Python libraries that assist in calling the SoftLayer API
 License:        MIT
 URL:            https://github.com/softlayer/softlayer-python
 Source:         https://github.com/softlayer/softlayer-python/archive/v%{version}.tar.gz
-# PATCH-FIX-UPSTREAM gh#softlayer/softlayer-python#2222
-Patch0:         support-click-8.2.patch
 BuildRequires:  %{python_module click >= 8.0.4}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module prettytable >= 2.5.0}
@@ -33,11 +31,10 @@ BuildRequires:  %{python_module prompt_toolkit >= 2}
 BuildRequires:  %{python_module pygments >= 2.0.0}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module requests >= 2.20.0}
-BuildRequires:  %{python_module rich >= 12.5.1}
+BuildRequires:  %{python_module rich >= 14.0.0}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module softlayer-zeep >= 5.0.0}
 BuildRequires:  %{python_module testtools}
-BuildRequires:  %{python_module typing_extensions}
 BuildRequires:  %{python_module urllib3 >= 1.24}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
@@ -48,10 +45,8 @@ Requires:       python-prompt_toolkit >= 2
 Requires:       python-pygments >= 2.0.0
 Requires:       python-requests >= 2.20.0
 Requires:       python-rich >= 12.5.1
-Requires:       python-setuptools
-Requires:       python-softlayer-zeep >= 5.0.0
-Requires:       python-typing_extensions
 Requires:       python-urllib3 >= 1.24
+Suggests:       python-softlayer-zeep >= 5.0.0
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 BuildArch:      noarch
@@ -75,7 +70,11 @@ This library provides a simple Python client to interact with SoftLayer's XML-RP
 
 %check
 # We do not want TKinter
-%pytest -k 'not test_getpass_issues1436 and not TestSoapAPICall'
+donttest="test_getpass_issues1436 or TestSoapAPICall"
+# Broken with Click 8.3+, re-enable on upgrade
+donttest+=" or test_list_hw_search_noargs or test_create_like "
+donttest+=" or test_list_vs_search_noargs"
+%pytest -k "not ($donttest)"
 
 %post
 %python_install_alternative slcli

support-click-8.2.patch

@@ -1,28 +0,0 @@
-From d92d20a97ac8e65524ccbfd7487d9c8899948544 Mon Sep 17 00:00:00 2001
-From: Steve Kowalik <steven@wedontsleep.org>
-Date: Thu, 22 May 2025 15:29:56 +0200
-Subject: [PATCH] Support Click 8.2+
-
-Click 8.2 and above will now force an abort if a confirmation prompt
-isn't answered, rather than raising the CLIAbort that is expected. Catch
-this exception so that our own exceptions are raised.
----
- SoftLayer/CLI/formatting.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/SoftLayer/CLI/formatting.py b/SoftLayer/CLI/formatting.py
-index b9eca571e..b4c9a98f7 100644
---- a/SoftLayer/CLI/formatting.py
-+++ b/SoftLayer/CLI/formatting.py
-@@ -260,7 +260,10 @@ def no_going_back(confirmation):
- 
-     prompt = f"This action cannot be undone! Type '{confirmation}' or press Enter to abort"
- 
--    ans = click.prompt(prompt, default='', show_default=False)
-+    try:
-+        ans = click.prompt(prompt, default='', show_default=False)
-+    except click.exceptions.Abort:
-+        return False
-     if ans.lower() == str(confirmation).lower():
-         return True
- 

v6.2.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f02fffc9340b2f0cd71205bb5b0bd33fba2b13437d7e6bec3ab128ed0b13736c
-size 2358810

v6.2.7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41b8fb8a64ee72c153bec79e4cb0a9c10398104d8f0315c05a2b3b5c62c420bb
+size 2337261