Skip to content

databroker>2.000 #1118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MDecarabas wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

databroker>2.000 #1118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
512b36d
databroker>2.000
MDecarabas Aug 22, 2025
1e119dc
version change
MDecarabas Aug 22, 2025
039301f
test
MDecarabas Aug 22, 2025
67b615a
narrowing down error
MDecarabas Aug 22, 2025
4f72f33
databroker test
MDecarabas Aug 22, 2025
adba3f5
removed databroker unpack
MDecarabas Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/workflows/code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +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: Directory Listings
# run: |
# set -vxeuo pipefail
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -83,7 +83,6 @@ dev = [
"pre-commit",
"pytest",
"ruff",
# databroker 2.0.0b57 needs
"doct",
"humanize",
"mongomock",
Expand Down
12 changes: 6 additions & 6 deletions resources/unpack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading