- Update to 6.2.6:

* Added feature to iter_call to force a orderBy filter
  * Fixed an issues with search command.
  * Added --owner, --public_ip and --private_ip search fields for hardware
    list
  * Added get_total_items to SoftLayerListResult.
  * Fixed invalid filter in vs migrate preventing guest list from being
    properly shown.
  * Sums up child items in invoices-detail
  * Updated vlan masks to fix id/number fields not being retrieved properly
  * Added x509 certificate support to cli
  * Added vpn status to user list.
  * Fixed a bug when displaying empty tables.
  * Added more error handling around table output
  * Reworked user permissions list to include permissions
  * More efficient created_by
  * Fixed a bug in the config parser
  * Fixed an issue with confirmation not handling uppercase ids
  * Removed requirements in volume-modify commands
  * Marked --crt and --key as required for slcli ssl add
  * Added network flag to update-firmware
  * Added detect-secrets workflow
  * Added support for python 3.12
  * Adding support for internal styles of authentication
- Add patch support-click-8.2.patch:
  * Support changes that Click 8.2 made.
- Switch to pyproject macros.
- No more greedy globs in %files.
- Package should be noarch.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-softlayer?expand=0&rev=41

python-softlayer.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Thu May 22 13:47:48 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 6.2.6:
+  * Added feature to iter_call to force a orderBy filter
+  * Fixed an issues with search command.
+  * Added --owner, --public_ip and --private_ip search fields for hardware
+    list
+  * Added get_total_items to SoftLayerListResult.
+  * Fixed invalid filter in vs migrate preventing guest list from being
+    properly shown.
+  * Sums up child items in invoices-detail
+  * Updated vlan masks to fix id/number fields not being retrieved properly
+  * Added x509 certificate support to cli
+  * Added vpn status to user list.
+  * Fixed a bug when displaying empty tables.
+  * Added more error handling around table output
+  * Reworked user permissions list to include permissions
+  * More efficient created_by
+  * Fixed a bug in the config parser
+  * Fixed an issue with confirmation not handling uppercase ids
+  * Removed requirements in volume-modify commands
+  * Marked --crt and --key as required for slcli ssl add
+  * Added network flag to update-firmware
+  * Added detect-secrets workflow
+  * Added support for python 3.12
+  * Adding support for internal styles of authentication
+- Add patch support-click-8.2.patch:
+  * Support changes that Click 8.2 made.
+- Switch to pyproject macros.
+- No more greedy globs in %files.
+- Package should be noarch.
+
 -------------------------------------------------------------------
 Fri Dec 29 09:17:14 UTC 2023 - Dirk Müller <dmueller@suse.com>
 

python-softlayer.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-softlayer
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,16 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-softlayer
-Version:        6.1.11
+Version:        6.2.6
 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}
 BuildRequires:  %{python_module prompt_toolkit >= 2}
 BuildRequires:  %{python_module pygments >= 2.0.0}
@@ -36,6 +39,7 @@ 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
 BuildRequires:  python-rpm-macros
 Requires:       python-click >= 8.0.4
@@ -48,9 +52,9 @@ Requires:       python-setuptools
 Requires:       python-softlayer-zeep >= 5.0.0
 Requires:       python-typing_extensions
 Requires:       python-urllib3 >= 1.24
-Conflicts:      sl
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
+BuildArch:      noarch
 %python_subpackages
 
 %description
@@ -60,12 +64,11 @@ This library provides a simple Python client to interact with SoftLayer's XML-RP
 %autosetup -p1 -n softlayer-python-%{version}
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_clone -a %{buildroot}%{_bindir}/slcli
-%python_clone -a %{buildroot}%{_bindir}/sl
 # do not install tests
 %python_expand rm -r %{buildroot}%{$python_sitelib}/tests/
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
@@ -76,17 +79,15 @@ This library provides a simple Python client to interact with SoftLayer's XML-RP
 
 %post
 %python_install_alternative slcli
-%python_install_alternative sl
 
 %postun
 %python_uninstall_alternative slcli
-%python_uninstall_alternative sl
 
 %files %{python_files}
 %license LICENSE
 %doc *.md
-%{python_sitelib}/*
+%{python_sitelib}/SoftLayer
-%python_alternative %{_bindir}/sl
+%{python_sitelib}/softlayer-%{version}.dist-info
 %python_alternative %{_bindir}/slcli
 
 %changelog

support-click-8.2.patch

@@ -0,0 +1,28 @@
+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.1.11.tar.gz

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

v6.2.6.tar.gz

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