diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index fa6a4e0f1..8d83d2638 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -80,11 +80,23 @@ 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;" @@ -92,7 +104,7 @@ jobs: cmd+=" print(databroker.catalog_search_path());" python -c "${cmd}" cd .. - + # - name: Directory Listings # run: | # set -vxeuo pipefail diff --git a/pyproject.toml b/pyproject.toml index cde71158b..8690e3deb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ dependencies = [ "bluesky-live", "bluesky>=1.6.2,!=1.11.0", "databroker-pack", - "databroker<=1.999", + "databroker>= 2.0.0a105", "Deprecated", "entrypoints", "h5py", @@ -83,7 +83,6 @@ dev = [ "pre-commit", "pytest", "ruff", - # databroker 2.0.0b57 needs "doct", "humanize", "mongomock", diff --git a/resources/unpack.sh b/resources/unpack.sh index 37fae5cf2..717574d31 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 +# databroker-pack --list