From 9dad6da7b80bc07423d45dab7b6799911740a082 Mon Sep 17 00:00:00 2001 From: Marco Donadoni Date: Thu, 29 Feb 2024 11:04:34 +0100 Subject: [PATCH 1/3] build(python): change extra names to comply with PEP 685 (#446) Since pip>=23.3.0, non-normalised extra names are ignored, so `snakemake_reports` is changed to `snakemake-reports`. The former name is kept for backward compatibility with older versions of pip. --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 192e4274..82fb22f7 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ "tabulate<0.9", "pulp>=2.7.0,<2.8.0", ], - "snakemake_reports": [ + "snakemake-reports": [ "snakemake==6.15.5 ; python_version<'3.7'", "snakemake==7.32.4 ; python_version>='3.7'", "pygraphviz<1.8", @@ -50,6 +50,9 @@ ], } +# backwards compatibility with extras before PEP 685 +extras_require["snakemake_reports"] = extras_require["snakemake-reports"] + extras_require["all"] = [] for key, reqs in extras_require.items(): if ":" == key[0]: From 17fd581d4928d5c377f67bcb77c4f245e661c395 Mon Sep 17 00:00:00 2001 From: Marco Donadoni Date: Thu, 29 Feb 2024 11:39:17 +0100 Subject: [PATCH 2/3] build(python): require smart-open<7 for Python 3.6 (#446) --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 82fb22f7..60ffb6c8 100755 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ "snakemake==7.32.4 ; python_version>='3.7'", "tabulate<0.9", "pulp>=2.7.0,<2.8.0", + "smart-open<7 ; python_version<'3.7'", # see https://github.com/piskvorky/smart_open/issues/806 ], "snakemake-reports": [ "snakemake==6.15.5 ; python_version<'3.7'", @@ -47,6 +48,7 @@ "pygraphviz<1.8", "tabulate<0.9", # tabulate 0.9 crashes snakemake, more info: https://github.com/snakemake/snakemake/issues/1899 "pulp>=2.7.0,<2.8.0", + "smart-open<7 ; python_version<'3.7'", # see https://github.com/piskvorky/smart_open/issues/806 ], } From 904178fe454b9af39164a0c327f1ecd1663132af Mon Sep 17 00:00:00 2001 From: Marco Donadoni Date: Thu, 29 Feb 2024 11:59:47 +0100 Subject: [PATCH 3/3] build(python): restore snakemake `reports` extra (#446) --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 60ffb6c8..8597fede 100755 --- a/setup.py +++ b/setup.py @@ -43,8 +43,8 @@ "smart-open<7 ; python_version<'3.7'", # see https://github.com/piskvorky/smart_open/issues/806 ], "snakemake-reports": [ - "snakemake==6.15.5 ; python_version<'3.7'", - "snakemake==7.32.4 ; python_version>='3.7'", + "snakemake[reports]==6.15.5 ; python_version<'3.7'", + "snakemake[reports]==7.32.4 ; python_version>='3.7'", "pygraphviz<1.8", "tabulate<0.9", # tabulate 0.9 crashes snakemake, more info: https://github.com/snakemake/snakemake/issues/1899 "pulp>=2.7.0,<2.8.0",