From f545d3db83f2a4a2d695c2961bbce625c1a00167 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Wed, 27 Nov 2024 10:01:43 -0700 Subject: [PATCH 1/4] Ignore the dist-info directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 91e74c46a..3401af3ab 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ ups/*.cfgc .pytest_cache pytest_session.txt .coverage +python/*.dist-info/ From d35ecc533f1f1a582b96da11782d5392c06c66fa Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Wed, 27 Nov 2024 10:02:31 -0700 Subject: [PATCH 2/4] Stop using env var for subcommand discovery Entry points now work for sconsUtils as well as pip install. --- python/lsst/pipe/base/cli/resources.yaml | 7 ------- ups/pipe_base.table | 1 - 2 files changed, 8 deletions(-) delete mode 100644 python/lsst/pipe/base/cli/resources.yaml diff --git a/python/lsst/pipe/base/cli/resources.yaml b/python/lsst/pipe/base/cli/resources.yaml deleted file mode 100644 index 6a166be64..000000000 --- a/python/lsst/pipe/base/cli/resources.yaml +++ /dev/null @@ -1,7 +0,0 @@ -cmd: - import: lsst.pipe.base.cli.cmd - commands: - - register-instrument - - transfer-from-graph - - zip-from-graph - - retrieve-artifacts-for-quanta diff --git a/ups/pipe_base.table b/ups/pipe_base.table index 29b97cc76..b79b66218 100644 --- a/ups/pipe_base.table +++ b/ups/pipe_base.table @@ -4,4 +4,3 @@ setupRequired(utils) setupRequired(resources) envPrepend(PYTHONPATH, ${PRODUCT_DIR}/python) -envPrepend(DAF_BUTLER_PLUGINS, ${PRODUCT_DIR}/python/lsst/pipe/base/cli/resources.yaml) From 0f439522bc8140fa6301de98a21e7337dce2d2ef Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Wed, 27 Nov 2024 10:05:04 -0700 Subject: [PATCH 3/4] Refresh pre-commit --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2e5e89843..86e1d16f6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: name: isort (python) - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.7.4 + rev: v0.8.0 hooks: - id: ruff - repo: https://github.com/numpy/numpydoc From 88cc8d4a01e7a571d61fb9e4863e2b9f360ec7b4 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Wed, 27 Nov 2024 13:25:17 -0700 Subject: [PATCH 4/4] No longer forward DAF_BUTLER_PLUGINS in tests --- tests/SConscript | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/SConscript b/tests/SConscript index 6fe165342..62820b3b5 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -4,6 +4,3 @@ import os from lsst.sconsUtils import env, scripts scripts.BasicSConscript.tests(pyList=[]) - -if "DAF_BUTLER_PLUGINS" in os.environ: - env["ENV"]["DAF_BUTLER_PLUGINS"] = os.environ["DAF_BUTLER_PLUGINS"]