From 47a0718cbf2ec38fbd2ccd28e4f21add8a67e322 Mon Sep 17 00:00:00 2001 From: Ben Clifford Date: Fri, 13 Oct 2023 11:18:50 +0000 Subject: [PATCH 1/4] Separate monitoring core and visualization dependencies This reflects a difference in code maturity and maintenance between the two: monitoring core is much more maintained and stable than visualization at the moment. Work with LSST has repeatedly encountered dependency problems caused by the visualization dependencies, even though those dependencies are not need by LSST, and this separation allows the visualization dependencies to be skipped. Breaking change: If you are using visualization you will now need to: pip install parsl[monitoring,visualization] to get all of the dependencies previously installed by [monitoring] --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index aec30ccd7d..e06ca085db 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,9 @@ extras_require = { 'monitoring' : [ - 'sqlalchemy>=1.4,<2', + 'sqlalchemy>=1.4,<2' + ], + 'visualization' : [ 'pydot', 'networkx>=2.5,<2.6', 'Flask>=1.0.2', From 33d2f6ba51d171bdf33bb09b2d86016840516247 Mon Sep 17 00:00:00 2001 From: Ben Clifford Date: Sat, 14 Oct 2023 19:08:22 +0000 Subject: [PATCH 2/4] Add as a dependency for CI --config local test --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0739954e9a..61a652a71c 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ wqex_local_test: $(CCTOOLS_INSTALL) ## run all tests with workqueue_ex config .PHONY: config_local_test config_local_test: - pip3 install ".[monitoring,proxystore]" + pip3 install ".[monitoring,viz,proxystore]" pytest parsl/tests/ -k "not cleannet" --config local --random-order --durations 10 .PHONY: site_test From 15cdb54a93ec6a699ddf2d87174491e1cf39ad75 Mon Sep 17 00:00:00 2001 From: Ben Clifford Date: Mon, 16 Oct 2023 00:01:43 +0000 Subject: [PATCH 3/4] Correct setup option name --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 61a652a71c..bac23fbddc 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ wqex_local_test: $(CCTOOLS_INSTALL) ## run all tests with workqueue_ex config .PHONY: config_local_test config_local_test: - pip3 install ".[monitoring,viz,proxystore]" + pip3 install ".[monitoring,visualization,proxystore]" pytest parsl/tests/ -k "not cleannet" --config local --random-order --durations 10 .PHONY: site_test From f269298af27e18c197f050e54b73c942c5e3c58b Mon Sep 17 00:00:00 2001 From: Ben Clifford Date: Sat, 21 Oct 2023 11:42:03 +0000 Subject: [PATCH 4/4] Update docs to refer to new setup option --- docs/userguide/monitoring.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/monitoring.rst b/docs/userguide/monitoring.rst index 5f26885099..b83994498b 100644 --- a/docs/userguide/monitoring.rst +++ b/docs/userguide/monitoring.rst @@ -56,7 +56,7 @@ Visualization To run the web dashboard utility ``parsl-visualize`` you first need to install its dependencies: - $ pip install 'parsl[monitoring]' + $ pip install 'parsl[monitoring,visualization]' To view the web dashboard while or after a Parsl program has executed, run the ``parsl-visualize`` utility::