From afbe875fe0df82b71a9935633182261491b17f01 Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Mon, 27 Jan 2025 16:20:16 +0100 Subject: [PATCH 1/2] pin default python version to the max currently allowed by galaxy pinnings fixes https://github.com/galaxyproject/planemo/issues/1489 --- planemo/options.py | 2 +- planemo/virtualenv.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/planemo/options.py b/planemo/options.py index 867d637c2..a01e4fb7b 100644 --- a/planemo/options.py +++ b/planemo/options.py @@ -177,7 +177,7 @@ def galaxy_python_version(): "--galaxy_python_version", use_global_config=True, default=None, - type=click.Choice(["3", "3.7", "3.8", "3.9", "3.10", "3.11"]), + type=click.Choice(["3.8", "3.9", "3.10", "3.11", "3.12"]), help="Python version to start Galaxy under", ) diff --git a/planemo/virtualenv.py b/planemo/virtualenv.py index d951f5cf4..b2a05783d 100644 --- a/planemo/virtualenv.py +++ b/planemo/virtualenv.py @@ -7,7 +7,7 @@ from galaxy.util.commands import which -DEFAULT_PYTHON_VERSION = os.environ.get("PLANEMO_DEFAULT_PYTHON_VERSION", "3") +DEFAULT_PYTHON_VERSION = os.environ.get("PLANEMO_DEFAULT_PYTHON_VERSION", "3.12") def create_command(virtualenv_path: str, galaxy_python_version: Optional[str] = None) -> str: From 7f233fd2738c54da060ec1e3af52f374869bd3de Mon Sep 17 00:00:00 2001 From: M Bernt Date: Mon, 27 Jan 2025 19:33:40 +0100 Subject: [PATCH 2/2] Add 3.13 to choices --- planemo/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planemo/options.py b/planemo/options.py index a01e4fb7b..bf20c7215 100644 --- a/planemo/options.py +++ b/planemo/options.py @@ -177,7 +177,7 @@ def galaxy_python_version(): "--galaxy_python_version", use_global_config=True, default=None, - type=click.Choice(["3.8", "3.9", "3.10", "3.11", "3.12"]), + type=click.Choice(["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]), help="Python version to start Galaxy under", )