From 5c9af65434b3050b261d562f6330790d6440fa6b Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Fri, 17 May 2024 01:20:03 +0200 Subject: [PATCH 1/3] move dependency on BeasutifulSoup in IPython v8.14.0 to jupyter-server --- .../easyconfigs/i/IPython/IPython-8.14.0-GCCcore-12.3.0.eb | 2 +- .../j/jupyter-server/jupyter-server-2.7.2-GCCcore-12.3.0.eb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/i/IPython/IPython-8.14.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/i/IPython/IPython-8.14.0-GCCcore-12.3.0.eb index 762f95fabdd8..78aaf35586a4 100644 --- a/easybuild/easyconfigs/i/IPython/IPython-8.14.0-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/i/IPython/IPython-8.14.0-GCCcore-12.3.0.eb @@ -15,13 +15,13 @@ toolchain = {'name': 'GCCcore', 'version': '12.3.0'} builddependencies = [ ('binutils', '2.40'), + ('hatchling', '1.18.0'), ] dependencies = [ ('Python', '3.11.3'), ('Python-bundle-PyPI', '2023.06'), ('ZeroMQ', '4.3.4'), ('lxml', '4.9.2'), - ('BeautifulSoup', '4.12.2'), ] sanity_pip_check = True diff --git a/easybuild/easyconfigs/j/jupyter-server/jupyter-server-2.7.2-GCCcore-12.3.0.eb b/easybuild/easyconfigs/j/jupyter-server/jupyter-server-2.7.2-GCCcore-12.3.0.eb index 53722e2f4cb9..9da7cc3f0373 100644 --- a/easybuild/easyconfigs/j/jupyter-server/jupyter-server-2.7.2-GCCcore-12.3.0.eb +++ b/easybuild/easyconfigs/j/jupyter-server/jupyter-server-2.7.2-GCCcore-12.3.0.eb @@ -16,7 +16,9 @@ builddependencies = [ ] dependencies = [ ('Python', '3.11.3'), + ('hatchling', '1.18.0'), # needed as dependency for hatch_jupyter_builder ('IPython', '8.14.0'), + ('BeautifulSoup', '4.12.2'), # needed by nbconvert ('PyYAML', '6.0'), ('PyZMQ', '25.1.1'), ('tornado', '6.3.2'), From d1f65dcb398a7bf00822707815916a4e86804667 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Fri, 17 May 2024 09:07:21 +0200 Subject: [PATCH 2/3] add hatchling as build dependency of IPython v8.17.2 --- .../easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb index d0cfdfb2d8c3..0365fdc9c70a 100644 --- a/easybuild/easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb @@ -15,6 +15,7 @@ toolchain = {'name': 'GCCcore', 'version': '13.2.0'} builddependencies = [ ('binutils', '2.40'), + ('hatchling', '1.18.0'), ] dependencies = [ @@ -22,7 +23,6 @@ dependencies = [ ('Python-bundle-PyPI', '2023.10'), ('ZeroMQ', '4.3.5'), ('lxml', '4.9.3'), - ('BeautifulSoup', '4.12.2'), ('jedi', '0.19.1') ] From 00fc3b318ada1256ad1ee47d56ac788eea0626a7 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Fri, 17 May 2024 09:27:33 +0200 Subject: [PATCH 3/3] Revert "add hatchling as build dependency of IPython v8.17.2" This reverts commit d1f65dcb398a7bf00822707815916a4e86804667. --- .../easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb index 0365fdc9c70a..d0cfdfb2d8c3 100644 --- a/easybuild/easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/i/IPython/IPython-8.17.2-GCCcore-13.2.0.eb @@ -15,7 +15,6 @@ toolchain = {'name': 'GCCcore', 'version': '13.2.0'} builddependencies = [ ('binutils', '2.40'), - ('hatchling', '1.18.0'), ] dependencies = [ @@ -23,6 +22,7 @@ dependencies = [ ('Python-bundle-PyPI', '2023.10'), ('ZeroMQ', '4.3.5'), ('lxml', '4.9.3'), + ('BeautifulSoup', '4.12.2'), ('jedi', '0.19.1') ]