From d5ad65973ae83ddc858302e53e673d797dce9d7f Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 8 May 2025 21:40:16 +0200 Subject: [PATCH 1/7] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4029cf33..31589607 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["cloudpickle", "pyzmq", "setuptools", "versioneer[toml]==0.29"] +requires = ["cloudpickle==3.1.1", "pyzmq==26.4.0", "setuptools==80.1.0", "versioneer[toml]==0.29"] build-backend = "setuptools.build_meta" [project] From a4c56b84fc12e83f7314409eb4ef76dff985c338 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 8 May 2025 21:41:01 +0200 Subject: [PATCH 2/7] Update environment-mini.yml --- .ci_support/environment-mini.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/environment-mini.yml b/.ci_support/environment-mini.yml index 16e73594..26c34776 100644 --- a/.ci_support/environment-mini.yml +++ b/.ci_support/environment-mini.yml @@ -5,4 +5,4 @@ dependencies: - numpy - cloudpickle =3.1.0 - pyzmq =26.2.0 -- setuptools =75.1.0 +- setuptools =80.1.0 From bed78e4eef70b5e60913c13034453eae9863ed73 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 8 May 2025 21:41:24 +0200 Subject: [PATCH 3/7] Update environment-mpich.yml --- .ci_support/environment-mpich.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/environment-mpich.yml b/.ci_support/environment-mpich.yml index 3cd43390..6e05a499 100644 --- a/.ci_support/environment-mpich.yml +++ b/.ci_support/environment-mpich.yml @@ -12,4 +12,4 @@ dependencies: - pygraphviz =1.14 - ipython =9.0.2 - pysqa =0.2.4 -- setuptools =75.1.0 +- setuptools =80.1.0 From 9735f5a3f060b859a5a5a75473d276ec6533a5f6 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 8 May 2025 21:41:41 +0200 Subject: [PATCH 4/7] Update environment-openmpi.yml --- .ci_support/environment-openmpi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/environment-openmpi.yml b/.ci_support/environment-openmpi.yml index 4e7bb246..c97feb66 100644 --- a/.ci_support/environment-openmpi.yml +++ b/.ci_support/environment-openmpi.yml @@ -12,4 +12,4 @@ dependencies: - pygraphviz =1.14 - pysqa =0.2.4 - ipython =9.0.2 -- setuptools =75.1.0 +- setuptools =80.1.0 From c9090f034bcc48725dda1bb247e3220e86c0ed1b Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 8 May 2025 21:42:04 +0200 Subject: [PATCH 5/7] Update environment-win.yml --- .ci_support/environment-win.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/environment-win.yml b/.ci_support/environment-win.yml index 8eb29961..778987db 100644 --- a/.ci_support/environment-win.yml +++ b/.ci_support/environment-win.yml @@ -11,4 +11,4 @@ dependencies: - networkx =3.4.2 - pygraphviz =1.14 - ipython =9.0.2 -- setuptools =75.1.0 +- setuptools =80.1.0 From 21b96d9f57fab84dd37f6bf08d06b5e4a18ec49d Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 8 May 2025 21:46:25 +0200 Subject: [PATCH 6/7] Update pyproject.toml --- pyproject.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 31589607..0e426ca6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,10 @@ [build-system] -requires = ["cloudpickle==3.1.1", "pyzmq==26.4.0", "setuptools==80.1.0", "versioneer[toml]==0.29"] +requires = [ + "cloudpickle==3.1.1", + "pyzmq==26.4.0", + "setuptools==80.1.0", + "versioneer[toml]==0.29", +] build-backend = "setuptools.build_meta" [project] From 808c4ab75da5dd6b326abfe193843188d8b780b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Thu, 8 May 2025 22:00:54 +0200 Subject: [PATCH 7/7] fixes --- .ci_support/environment-old.yml | 1 + .ci_support/release.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci_support/environment-old.yml b/.ci_support/environment-old.yml index 150bd3f4..3c863f61 100644 --- a/.ci_support/environment-old.yml +++ b/.ci_support/environment-old.yml @@ -11,3 +11,4 @@ dependencies: - networkx =2.8.8 - ipython =7.33.0 - pygraphviz =1.10 +- setuptools =75.1.0 diff --git a/.ci_support/release.py b/.ci_support/release.py index cb90330c..93ebb32c 100644 --- a/.ci_support/release.py +++ b/.ci_support/release.py @@ -3,8 +3,8 @@ def get_setup_version_and_pattern(setup_content): for l in setup_content: if "==" in l: lst = ( - l.split("[")[-1] - .split("]")[0] + l.split("= [")[-1] + .split("]\n")[0] .replace(" ", "") .replace('"', "") .replace("'", "")