From c3bba2fa83d3ba3ca15a4aa6e28ee25f721ff33a Mon Sep 17 00:00:00 2001 From: Peter Van Dyken Date: Fri, 12 Jan 2024 13:39:35 -0500 Subject: [PATCH] Restrict pulp version in template app The latest versions of pulp dropped a deprecated api snakemake dependended on. Newer versions of snakemake will address this, but older versions don't have an upper pin on pulp. We cannot lower-pin the snakemake version, as we need older snakemakes to maintain support for python < 3.11. --- ...uild_system != 'poetry' %}pyproject.toml{% endif %}.jinja | 5 +++++ ...uild_system == 'poetry' %}pyproject.toml{% endif %}.jinja | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/snakebids/project_template/{% if build_system != 'poetry' %}pyproject.toml{% endif %}.jinja b/snakebids/project_template/{% if build_system != 'poetry' %}pyproject.toml{% endif %}.jinja index daaf5c65..049b5671 100644 --- a/snakebids/project_template/{% if build_system != 'poetry' %}pyproject.toml{% endif %}.jinja +++ b/snakebids/project_template/{% if build_system != 'poetry' %}pyproject.toml{% endif %}.jinja @@ -30,6 +30,11 @@ requires-python = "{{ python_version }}" dependencies = [ "snakemake >= {{ snakemake_version }},<8", "snakebids >= {{ snakebids_version }}", + {#- newer pulps are incompatible with old snakemakes, and we need to support + old snakemakes for python versions <3.11. So cap pulp to the last working + version + #} + "pulp < 2.8.0", ] [project.scripts] diff --git a/snakebids/project_template/{% if build_system == 'poetry' %}pyproject.toml{% endif %}.jinja b/snakebids/project_template/{% if build_system == 'poetry' %}pyproject.toml{% endif %}.jinja index 4b2a37fd..a890f0ed 100644 --- a/snakebids/project_template/{% if build_system == 'poetry' %}pyproject.toml{% endif %}.jinja +++ b/snakebids/project_template/{% if build_system == 'poetry' %}pyproject.toml{% endif %}.jinja @@ -24,6 +24,11 @@ classifiers = [ python = "{{ python_version }}" snakemake = ">={{ snakemake_version }},<8" snakebids = ">={{ snakebids_version }}" +{#- newer pulps are incompatible with old snakemakes, and we need to support +old snakemakes for python versions <3.11. So cap pulp to the last working +version +#} +pulp = "<2.8.0" pandas = [ { version = "<=2.0.3", python = "<3.9" }, { version = ">=2.1.1", python = ">=3.12" },