From 512b36d6bb594703260756815f055574b562b70f Mon Sep 17 00:00:00 2001 From: Eric Codrea Date: Fri, 22 Aug 2025 12:26:41 -0500 Subject: [PATCH 1/6] databroker>2.000 --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cde71158b..e06b39a92 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,8 +47,8 @@ dependencies = [ "area-detector-handlers", "bluesky-live", "bluesky>=1.6.2,!=1.11.0", + "databroker=>2.000", "databroker-pack", - "databroker<=1.999", "Deprecated", "entrypoints", "h5py", @@ -83,7 +83,6 @@ dev = [ "pre-commit", "pytest", "ruff", - # databroker 2.0.0b57 needs "doct", "humanize", "mongomock", From 1e119dc2b91c9bca4dbdba823e5c0b02473f9153 Mon Sep 17 00:00:00 2001 From: Eric Codrea Date: Fri, 22 Aug 2025 12:39:38 -0500 Subject: [PATCH 2/6] version change --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e06b39a92..8690e3deb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,8 +47,8 @@ dependencies = [ "area-detector-handlers", "bluesky-live", "bluesky>=1.6.2,!=1.11.0", - "databroker=>2.000", "databroker-pack", + "databroker>= 2.0.0a105", "Deprecated", "entrypoints", "h5py", From 039301f6e9bacb8c02fa05a5af53070460f54932 Mon Sep 17 00:00:00 2001 From: Eric Codrea Date: Fri, 22 Aug 2025 13:01:58 -0500 Subject: [PATCH 3/6] test --- .github/workflows/code.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index fa6a4e0f1..6b4e72510 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -80,18 +80,18 @@ jobs: set -vxeuo pipefail pip install -e .[dev] - - name: Unpack - run: | - set -vxeuo pipefail - which databroker-pack - which databroker-unpack - cd resources - bash ./unpack.sh - cmd="import databroker;" - cmd+=" print(list(databroker.catalog));" - cmd+=" print(databroker.catalog_search_path());" - python -c "${cmd}" - cd .. + # - name: Unpack + # run: | + # set -vxeuo pipefail + # which databroker-pack + # which databroker-unpack + # cd resources + # bash ./unpack.sh + # cmd="import databroker;" + # cmd+=" print(list(databroker.catalog));" + # cmd+=" print(databroker.catalog_search_path());" + # python -c "${cmd}" + # cd .. # - name: Directory Listings # run: | From 67b615aa4900eaf6c248d84c1ec31e23789b4840 Mon Sep 17 00:00:00 2001 From: Eric Codrea Date: Fri, 22 Aug 2025 13:06:11 -0500 Subject: [PATCH 4/6] narrowing down error --- .github/workflows/code.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 6b4e72510..2da99ff26 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -93,6 +93,18 @@ jobs: # python -c "${cmd}" # cd .. + - name: Unpack + run: | + set -vxeuo pipefail + which databroker-pack + which databroker-unpack + cd resources + cmd="import databroker;" + cmd+=" print(list(databroker.catalog));" + cmd+=" print(databroker.catalog_search_path());" + python -c "${cmd}" + cd .. + # - name: Directory Listings # run: | # set -vxeuo pipefail From 4f72f3384c3288de6995a09415644f7c85304019 Mon Sep 17 00:00:00 2001 From: Eric Codrea Date: Fri, 22 Aug 2025 13:09:40 -0500 Subject: [PATCH 5/6] databroker test --- .github/workflows/code.yml | 26 +++++++++++++------------- resources/unpack.sh | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 2da99ff26..a7b01b128 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -80,30 +80,30 @@ jobs: set -vxeuo pipefail pip install -e .[dev] - # - name: Unpack - # run: | - # set -vxeuo pipefail - # which databroker-pack - # which databroker-unpack - # cd resources - # bash ./unpack.sh - # cmd="import databroker;" - # cmd+=" print(list(databroker.catalog));" - # cmd+=" print(databroker.catalog_search_path());" - # python -c "${cmd}" - # cd .. - - name: Unpack run: | set -vxeuo pipefail which databroker-pack which databroker-unpack cd resources + bash ./unpack.sh cmd="import databroker;" cmd+=" print(list(databroker.catalog));" cmd+=" print(databroker.catalog_search_path());" python -c "${cmd}" cd .. + + # - name: Unpack + # run: | + # set -vxeuo pipefail + # which databroker-pack + # which databroker-unpack + # cd resources + # cmd="import databroker;" + # cmd+=" print(list(databroker.catalog));" + # cmd+=" print(databroker.catalog_search_path());" + # python -c "${cmd}" + # cd .. # - name: Directory Listings # run: | diff --git a/resources/unpack.sh b/resources/unpack.sh index 37fae5cf2..750ff8acc 100755 --- a/resources/unpack.sh +++ b/resources/unpack.sh @@ -8,11 +8,11 @@ CAT+=" usaxs_test" TMP=/tmp # TODO: What about Windows? SRC=$(dirname $(readlink -f $0)) -for c in ${CAT}; do - echo ${SRC}/${c}.zip - unzip -u ${SRC}/${c}.zip -d ${TMP} - databroker-unpack inplace ${TMP}/${c} ${c} -done +# for c in ${CAT}; do +# echo ${SRC}/${c}.zip +# unzip -u ${SRC}/${c}.zip -d ${TMP} +# databroker-unpack inplace ${TMP}/${c} ${c} +# done # show all available catalogs databroker-pack --list From adba3f55c367decf7fdf2ab0a8080c551b4685d6 Mon Sep 17 00:00:00 2001 From: Eric Codrea Date: Fri, 22 Aug 2025 13:14:45 -0500 Subject: [PATCH 6/6] removed databroker unpack --- .github/workflows/code.yml | 28 ++++++++++++++-------------- resources/unpack.sh | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index a7b01b128..8d83d2638 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -80,31 +80,31 @@ jobs: set -vxeuo pipefail pip install -e .[dev] - - name: Unpack - run: | - set -vxeuo pipefail - which databroker-pack - which databroker-unpack - cd resources - bash ./unpack.sh - cmd="import databroker;" - cmd+=" print(list(databroker.catalog));" - cmd+=" print(databroker.catalog_search_path());" - python -c "${cmd}" - cd .. - # - name: Unpack # run: | # set -vxeuo pipefail # which databroker-pack # which databroker-unpack # cd resources + # bash ./unpack.sh # cmd="import databroker;" # cmd+=" print(list(databroker.catalog));" # cmd+=" print(databroker.catalog_search_path());" # python -c "${cmd}" # cd .. - + + - name: Unpack + run: | + set -vxeuo pipefail + which databroker-pack + cd resources + bash ./unpack.sh + cmd="import databroker;" + cmd+=" print(list(databroker.catalog));" + cmd+=" print(databroker.catalog_search_path());" + python -c "${cmd}" + cd .. + # - name: Directory Listings # run: | # set -vxeuo pipefail diff --git a/resources/unpack.sh b/resources/unpack.sh index 750ff8acc..717574d31 100755 --- a/resources/unpack.sh +++ b/resources/unpack.sh @@ -15,4 +15,4 @@ SRC=$(dirname $(readlink -f $0)) # done # show all available catalogs -databroker-pack --list +# databroker-pack --list