Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions did_finder_cernopendata/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cernopendata/cernopendata-client:0.3.0
FROM python:3.10

LABEL maintainer="Gordon Watts <gwatts@uw.edu>"

Expand All @@ -16,7 +16,7 @@ ENV POETRY_VERSION=2.1.1
# during install. If we delete it before installing poetry it will
# recognize it as its own and handle it correctly
# See: https://github.com/python-poetry/poetry/issues/5977
RUN pip uninstall -y certifi
#RUN pip uninstall -y certifi

RUN pip install poetry==$POETRY_VERSION

Expand Down
26 changes: 24 additions & 2 deletions did_finder_cernopendata/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions did_finder_cernopendata/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ packages = [{include = "did_finder_cernopendata", from = "src"}]

[tool.poetry.dependencies]
python = "~3.10"
cernopendata-client = "1.0.0"
servicex-did-finder-lib = "^3.1.1"

[tool.poetry.group.test]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ def find_files(
"CERNOpenData can only work with dataset numbers as names (e.g. 1507)"
)

cmd = f"cernopendata-client get-file-locations --recid {did_name}".split(" ")
cmd = f"cernopendata-client get-file-locations --protocol xrootd --recid {did_name}".split(
" "
)

with Popen(
cmd, stdout=PIPE, stderr=STDOUT, bufsize=1, universal_newlines=True
Expand Down