Merge pull request #458 from lsst/tickets/DM-42226

DM-42226: Remove DAF_BUTLER_PLUGINS support
lsst · Jan 2, 2025 · cd2e615 · cd2e615
2 parents 269e412 + 88cc8d4
commit cd2e615
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ ups/*.cfgc
 .pytest_cache
 pytest_session.txt
 .coverage
+python/*.dist-info/
diff --git 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

diff --git a/python/lsst/pipe/base/cli/resources.yaml b/python/lsst/pipe/base/cli/resources.yaml
diff --git 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"]
diff --git 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)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)