From f9b2b55fda48182db27d7743e1fcd9e36e7ceb36 Mon Sep 17 00:00:00 2001 From: larsevj Date: Fri, 13 Sep 2024 10:41:40 +0200 Subject: [PATCH] Remove unstable symlink references --- komodoenv/__main__.py | 6 ++---- pyproject.toml | 2 +- tests/conftest.py | 2 -- tests/test_main.py | 5 ----- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/komodoenv/__main__.py b/komodoenv/__main__.py index ae28239..02105d5 100644 --- a/komodoenv/__main__.py +++ b/komodoenv/__main__.py @@ -29,8 +29,6 @@ def get_release_maturity_text(release_path): "You will need to recreate komodoenv in order to use new " "executables in komodo.\n", ) - elif name.startswith("unstable"): - return yellow("Warning: Tracking an unstable release of komodo.\n") elif name.startswith("testing"): return yellow("Warning: Tracking a testing release of komodo.\n") elif name.startswith("stable"): @@ -99,7 +97,7 @@ def resolve_release( # noqa: C901 print(f"Looking for {name}") - for mode in "stable", "testing", "unstable", "bleeding": + for mode in "stable", "testing", "bleeding": for rhver in "", distro_suffix(): dir_ = root / (mode + pyver + rhver) track = root / (mode + pyver) @@ -114,7 +112,7 @@ def resolve_release( # noqa: C901 return (symlink, track) sys.exit( - "Could not automatically detect an appropriate Komodo release to track (one of: stable, testing, unstable, bleeding).\n" + "Could not automatically detect an appropriate Komodo release to track (one of: stable, testing, bleeding).\n" "Use --no-update to make a komodoenv of a singular release.", ) diff --git a/pyproject.toml b/pyproject.toml index 6523017..d930948 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=30.3.0", "setuptools_scm", "pip>=24"] +requires = ["setuptools>=65", "setuptools_scm", "pip>=24"] [tool.ruff] src = ["komodoenv"] diff --git a/tests/conftest.py b/tests/conftest.py index 49a9ff4..316d1b8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -54,8 +54,6 @@ def komodo_root(tmp_path_factory, python38_path): ("stable", "stable-py3", "stable-py38", "2030.01-py38"), # Testing points to py38, rhel7 ("testing", "testing-py3", "testing-py38", "2030.02-py38"), - # Unstable refers to a future version of RHEL - ("unstable", "unstable-py3", "unstable-py38", "2030.03-py38"), # Bleeding points to py38, rhel7 ("bleeding", "bleeding-py3", "bleeding-py38"), ): diff --git a/tests/test_main.py b/tests/test_main.py index 1c513f7..8e9e1b4 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -33,11 +33,6 @@ def test_resolve_simple(komodo_root, track_name, name, expect): "", "bleed", "bleeding-", - # Unstable points to a non-existant, future version of RHEL and - # therefore not possible to resolve - "unstable", - "unstable-py3", - "unstable-py38", "2030.03.00-py38", "2030.03.00-py38-rhel9", # Singular release