diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index f09354735..c9eb15e54 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.11] + python-version: [3.14] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95afeced1..83a01c0ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,10 +18,10 @@ jobs: id-token: write steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python 3.14 uses: actions/setup-python@v4 with: - python-version: 3.11 + python-version: 3.14 - name: Install pypa/build run: >- python -m diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 35ae72725..3dca03b03 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8,3.9,'3.10',3.11,3.12] + python-version: ['3.10',3.11,3.12,3.13,3.14] steps: - uses: actions/checkout@v4 @@ -31,7 +31,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.12 + python-version: 3.14 - name: Install dependencies run: | python -m pip install --upgrade pip @@ -45,7 +45,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.12 + python-version: 3.14 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.gitignore b/.gitignore index 5dd1975be..72fd99883 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,9 @@ dist/* .cache .idea .pytest_cache/* +.vscode/* + +techbabble.xyz.crt +techbabble.xyz.csr +techbabble.xyz.icc +techbabble.xyz.key diff --git a/SoftLayer/CLI/environment.py b/SoftLayer/CLI/environment.py index d5b8f584b..b1284ebfa 100644 --- a/SoftLayer/CLI/environment.py +++ b/SoftLayer/CLI/environment.py @@ -115,11 +115,14 @@ def getpass(self, prompt, default=None): if password == 'àR': # tkinter is a built in python gui, but it has clipboard reading functions. # pylint: disable=import-outside-toplevel - from tkinter import Tk - tk_manager = Tk() - password = tk_manager.clipboard_get() - # keep the window from showing - tk_manager.withdraw() + try: + from tkinter import Tk + tk_manager = Tk() + password = tk_manager.clipboard_get() + # keep the window from showing + tk_manager.withdraw() + except ImportError: + return password return password # Command loading methods diff --git a/setup.py b/setup.py index ee4b2174b..191010c0b 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( name='SoftLayer', - version='v6.2.9', + version='v6.3.0', description=DESCRIPTION, long_description=LONG_DESCRIPTION, long_description_content_type='text/x-rst', @@ -30,14 +30,14 @@ 'slcli = SoftLayer.CLI.core:main', ], }, - python_requires='>=3.7', + python_requires='>=3.10', install_requires=[ 'click >= 8.0.4', 'requests >= 2.32.2', 'prompt_toolkit >= 2', 'pygments >= 2.0.0', 'urllib3 >= 1.24', - 'rich == 14.3.3' + 'rich == 15.0.0' ], keywords=['softlayer', 'cloud', 'slcli', 'ibmcloud'], classifiers=[ @@ -48,12 +48,10 @@ 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Topic :: Software Development :: Libraries :: Python Modules', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.14', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', ], diff --git a/tests/CLI/environment_tests.py b/tests/CLI/environment_tests.py index e0b739b1a..49eded8fb 100644 --- a/tests/CLI/environment_tests.py +++ b/tests/CLI/environment_tests.py @@ -6,12 +6,20 @@ """ import click +import pytest from unittest import mock as mock from SoftLayer.CLI import environment from SoftLayer.CLI import formatting from SoftLayer import testing +# Check if tkinter is available +try: + import tkinter # noqa: F401 + TKINTER_AVAILABLE = True +except ImportError: + TKINTER_AVAILABLE = False + @click.command() def fixture_command(): @@ -54,6 +62,7 @@ def test_getpass(self, prompt_mock): prompt_mock.assert_called_with('input', default=None, hide_input=True) self.assertEqual(prompt_mock(), r) + @pytest.mark.skipif(not TKINTER_AVAILABLE, reason="tkinter module not available") @mock.patch('click.prompt') @mock.patch('tkinter.Tk') def test_getpass_issues1436(self, tk, prompt_mock): diff --git a/tests/api_tests.py b/tests/api_tests.py index bf02b8cbd..13a76a2d4 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -555,6 +555,8 @@ def test_cf_call_large_dataset(self, _call): _call.side_effect = side_effects result = self.client.cf_call('SERVICE', 'METHOD', limit=limit) + # sort the results to ensure they are in order + result = sorted(result) self.assertEqual(_call.call_count, num_calls) self.assertEqual(len(result), total_items) diff --git a/tools/requirements.txt b/tools/requirements.txt index 31f9584de..6fe5aba69 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,9 +1,9 @@ click == 8.1.8 -requests >= 2.32.2 -prompt_toolkit >= 2 -pygments >= 2.0.0 -urllib3 >= 1.24 -rich == 14.3.3 +requests >= 2.32.5 +prompt_toolkit >= 3.0.52 +pygments >= 2.20.0 +urllib3 >= 2.6.3 +rich == 15.0.0 # only used for soap transport # softlayer-zeep >= 5.0.0 diff --git a/tools/test-requirements.txt b/tools/test-requirements.txt index 35ce0c513..b6716fc01 100644 --- a/tools/test-requirements.txt +++ b/tools/test-requirements.txt @@ -5,10 +5,10 @@ pytest-cov mock sphinx click == 8.1.8 -requests >= 2.32.2 -prompt_toolkit >= 2 -pygments >= 2.0.0 -urllib3 >= 1.24 +requests >= 2.32.5 +prompt_toolkit >= 3.0.52 +pygments >= 2.20.0 +urllib3 >= 2.6.3 rich >= 12.3.0 flake8 autopep8 diff --git a/tox.ini b/tox.ini index fccc3fbc7..bfaace3c6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38,py39,py310,py311,py312,pypy3,analysis,coverage,docs +envlist = py310,py311,py312,py313,314,pypy3,analysis,coverage,docs [flake8]