From 7b28274de017340b95fcb6d9b6bb436ee2469628063bd7b70e9dc402d204f048 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 10 Sep 2025 16:08:10 +0000 Subject: [PATCH] Accepting request 1303648 from home:glaubitz:branches:devel:languages:python - 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 OBS-URL: https://build.opensuse.org/request/show/1303648 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-softlayer?expand=0&rev=43 --- python-softlayer.changes | 19 +++++++++++++++++++ python-softlayer.spec | 6 ++---- support-click-8.2.patch | 28 ---------------------------- v6.2.6.tar.gz | 3 --- v6.2.7.tar.gz | 3 +++ 5 files changed, 24 insertions(+), 35 deletions(-) delete mode 100644 support-click-8.2.patch delete mode 100644 v6.2.6.tar.gz create mode 100644 v6.2.7.tar.gz diff --git a/python-softlayer.changes b/python-softlayer.changes index bc28aa2..ac8addc 100644 --- a/python-softlayer.changes +++ b/python-softlayer.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Sep 10 12:17:54 UTC 2025 - John Paul Adrian Glaubitz + +- 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 diff --git a/python-softlayer.spec b/python-softlayer.spec index 455fa68..2078394 100644 --- a/python-softlayer.spec +++ b/python-softlayer.spec @@ -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,7 +31,7 @@ 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} diff --git a/support-click-8.2.patch b/support-click-8.2.patch deleted file mode 100644 index 2df62d4..0000000 --- a/support-click-8.2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d92d20a97ac8e65524ccbfd7487d9c8899948544 Mon Sep 17 00:00:00 2001 -From: Steve Kowalik -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 - diff --git a/v6.2.6.tar.gz b/v6.2.6.tar.gz deleted file mode 100644 index de5ce6e..0000000 --- a/v6.2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f02fffc9340b2f0cd71205bb5b0bd33fba2b13437d7e6bec3ab128ed0b13736c -size 2358810 diff --git a/v6.2.7.tar.gz b/v6.2.7.tar.gz new file mode 100644 index 0000000..4b0ae2b --- /dev/null +++ b/v6.2.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41b8fb8a64ee72c153bec79e4cb0a9c10398104d8f0315c05a2b3b5c62c420bb +size 2337261