Merge branch 'main' into napari

NSLS-II · Jan 8, 2024 · 85ce3a3 · 85ce3a3
2 parents a182e43 + 8b07a3b
commit 85ce3a3
Show file tree

Hide file tree

Showing 40 changed files with 3 additions and 3 deletions.
diff --git a/bloptools/__init__.py → blop/__init__.py b/bloptools/__init__.py → blop/__init__.py
diff --git a/bloptools/_version.py → blop/_version.py b/bloptools/_version.py → blop/_version.py
@@ -22,9 +22,9 @@ def get_keywords():
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = "$Format:%d$"
-    git_full = "$Format:%H$"
-    git_date = "$Format:%ci$"
+    git_refnames = " (HEAD -> main)"
+    git_full = "a09f82569e91255c8591efce18ff684aae682970"
+    git_date = "2024-01-06 19:41:45 -0500"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 

diff --git a/bloptools/bayesian/__init__.py → blop/bayesian/__init__.py b/bloptools/bayesian/__init__.py → blop/bayesian/__init__.py
diff --git a/bloptools/bayesian/acquisition/__init__.py → blop/bayesian/acquisition/__init__.py b/bloptools/bayesian/acquisition/__init__.py → blop/bayesian/acquisition/__init__.py
diff --git a/bloptools/bayesian/acquisition/analytic.py → blop/bayesian/acquisition/analytic.py b/bloptools/bayesian/acquisition/analytic.py → blop/bayesian/acquisition/analytic.py
diff --git a/bloptools/bayesian/acquisition/config.yml → blop/bayesian/acquisition/config.yml b/bloptools/bayesian/acquisition/config.yml → blop/bayesian/acquisition/config.yml
diff --git a/...tools/bayesian/acquisition/monte_carlo.py → blop/bayesian/acquisition/monte_carlo.py b/...tools/bayesian/acquisition/monte_carlo.py → blop/bayesian/acquisition/monte_carlo.py
diff --git a/bloptools/bayesian/agent.py → blop/bayesian/agent.py b/bloptools/bayesian/agent.py → blop/bayesian/agent.py
diff --git a/bloptools/bayesian/digestion.py → blop/bayesian/digestion.py b/bloptools/bayesian/digestion.py → blop/bayesian/digestion.py
diff --git a/bloptools/bayesian/dofs.py → blop/bayesian/dofs.py b/bloptools/bayesian/dofs.py → blop/bayesian/dofs.py
diff --git a/bloptools/bayesian/kernels.py → blop/bayesian/kernels.py b/bloptools/bayesian/kernels.py → blop/bayesian/kernels.py
diff --git a/bloptools/bayesian/models.py → blop/bayesian/models.py b/bloptools/bayesian/models.py → blop/bayesian/models.py
diff --git a/bloptools/bayesian/objectives.py → blop/bayesian/objectives.py b/bloptools/bayesian/objectives.py → blop/bayesian/objectives.py
diff --git a/bloptools/bayesian/plans.py → blop/bayesian/plans.py b/bloptools/bayesian/plans.py → blop/bayesian/plans.py
diff --git a/bloptools/bayesian/plotting.py → blop/bayesian/plotting.py b/bloptools/bayesian/plotting.py → blop/bayesian/plotting.py
diff --git a/bloptools/bayesian/transforms.py → blop/bayesian/transforms.py b/bloptools/bayesian/transforms.py → blop/bayesian/transforms.py
diff --git a/bloptools/de/__init__.py → blop/de/__init__.py b/bloptools/de/__init__.py → blop/de/__init__.py
diff --git a/bloptools/de/de_opt_utils.py → blop/de/de_opt_utils.py b/bloptools/de/de_opt_utils.py → blop/de/de_opt_utils.py
diff --git a/bloptools/de/de_optimization.py → blop/de/de_optimization.py b/bloptools/de/de_optimization.py → blop/de/de_optimization.py
diff --git a/bloptools/de/hardware_flyer.py → blop/de/hardware_flyer.py b/bloptools/de/hardware_flyer.py → blop/de/hardware_flyer.py
diff --git a/bloptools/experiments/__init__.py → blop/experiments/__init__.py b/bloptools/experiments/__init__.py → blop/experiments/__init__.py
diff --git a/bloptools/experiments/atf/__init__.py → blop/experiments/atf/__init__.py b/bloptools/experiments/atf/__init__.py → blop/experiments/atf/__init__.py
diff --git a/bloptools/experiments/atf/atf.py → blop/experiments/atf/atf.py b/bloptools/experiments/atf/atf.py → blop/experiments/atf/atf.py
diff --git a/bloptools/experiments/nsls2/__init__.py → blop/experiments/nsls2/__init__.py b/bloptools/experiments/nsls2/__init__.py → blop/experiments/nsls2/__init__.py
diff --git a/bloptools/experiments/nsls2/iss.py → blop/experiments/nsls2/iss.py b/bloptools/experiments/nsls2/iss.py → blop/experiments/nsls2/iss.py
diff --git a/bloptools/experiments/nsls2/tes.py → blop/experiments/nsls2/tes.py b/bloptools/experiments/nsls2/tes.py → blop/experiments/nsls2/tes.py
diff --git a/bloptools/experiments/sirepo/__init__.py → blop/experiments/sirepo/__init__.py b/bloptools/experiments/sirepo/__init__.py → blop/experiments/sirepo/__init__.py
diff --git a/bloptools/experiments/sirepo/tes.py → blop/experiments/sirepo/tes.py b/bloptools/experiments/sirepo/tes.py → blop/experiments/sirepo/tes.py
diff --git a/bloptools/tests/__init__.py → blop/tests/__init__.py b/bloptools/tests/__init__.py → blop/tests/__init__.py
diff --git a/bloptools/tests/conftest.py → blop/tests/conftest.py b/bloptools/tests/conftest.py → blop/tests/conftest.py
diff --git a/bloptools/tests/test_acq_funcs.py → blop/tests/test_acq_funcs.py b/bloptools/tests/test_acq_funcs.py → blop/tests/test_acq_funcs.py
diff --git a/bloptools/tests/test_agent.py → blop/tests/test_agent.py b/bloptools/tests/test_agent.py → blop/tests/test_agent.py
diff --git a/bloptools/tests/test_napari.py → blop/tests/test_napari.py b/bloptools/tests/test_napari.py → blop/tests/test_napari.py
diff --git a/bloptools/tests/test_passive_dofs.py → blop/tests/test_passive_dofs.py b/bloptools/tests/test_passive_dofs.py → blop/tests/test_passive_dofs.py
diff --git a/bloptools/tests/test_plots.py → blop/tests/test_plots.py b/bloptools/tests/test_plots.py → blop/tests/test_plots.py
diff --git a/bloptools/tests/test_read_write.py → blop/tests/test_read_write.py b/bloptools/tests/test_read_write.py → blop/tests/test_read_write.py
diff --git a/bloptools/utils/__init__.py → blop/utils/__init__.py b/bloptools/utils/__init__.py → blop/utils/__init__.py
diff --git a/bloptools/utils/functions.py → blop/utils/functions.py b/bloptools/utils/functions.py → blop/utils/functions.py
diff --git a/bloptools/utils/misc.py → blop/utils/misc.py b/bloptools/utils/misc.py → blop/utils/misc.py
diff --git a/bloptools/utils/prepare_re_env.py → blop/utils/prepare_re_env.py b/bloptools/utils/prepare_re_env.py → blop/utils/prepare_re_env.py