From 2c0a4f3693ba5c3bf8a4ac21dbc87239d9c1beb2 Mon Sep 17 00:00:00 2001 From: Peter Onyisi Date: Fri, 31 Oct 2025 22:42:18 -0500 Subject: [PATCH 1/4] cernopendata update --- did_finder_cernopendata/Dockerfile | 2 +- did_finder_cernopendata/src/did_finder_cernopendata/celery.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/did_finder_cernopendata/Dockerfile b/did_finder_cernopendata/Dockerfile index 0fbd44249..988fecbf3 100644 --- a/did_finder_cernopendata/Dockerfile +++ b/did_finder_cernopendata/Dockerfile @@ -1,4 +1,4 @@ -FROM cernopendata/cernopendata-client:0.3.0 +FROM cernopendata/cernopendata-client:1.0.0 LABEL maintainer="Gordon Watts " diff --git a/did_finder_cernopendata/src/did_finder_cernopendata/celery.py b/did_finder_cernopendata/src/did_finder_cernopendata/celery.py index e0dc7e107..3ac0d167f 100644 --- a/did_finder_cernopendata/src/did_finder_cernopendata/celery.py +++ b/did_finder_cernopendata/src/did_finder_cernopendata/celery.py @@ -76,7 +76,7 @@ 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 From 85ad13609fc646552a9c68161ebc68276aa1d459 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 1 Nov 2025 03:43:16 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- did_finder_cernopendata/src/did_finder_cernopendata/celery.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/did_finder_cernopendata/src/did_finder_cernopendata/celery.py b/did_finder_cernopendata/src/did_finder_cernopendata/celery.py index 3ac0d167f..3a6fbd977 100644 --- a/did_finder_cernopendata/src/did_finder_cernopendata/celery.py +++ b/did_finder_cernopendata/src/did_finder_cernopendata/celery.py @@ -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 --protocol xrootd --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 From 60c2640b2eaa01e78eda4bc4164f3cf650b41d7e Mon Sep 17 00:00:00 2001 From: Peter Onyisi Date: Fri, 31 Oct 2025 23:23:47 -0500 Subject: [PATCH 3/4] Change base image --- did_finder_cernopendata/Dockerfile | 4 ++-- did_finder_cernopendata/poetry.lock | 26 ++++++++++++++++++++++++-- did_finder_cernopendata/pyproject.toml | 1 + 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/did_finder_cernopendata/Dockerfile b/did_finder_cernopendata/Dockerfile index 988fecbf3..206acdf7a 100644 --- a/did_finder_cernopendata/Dockerfile +++ b/did_finder_cernopendata/Dockerfile @@ -1,4 +1,4 @@ -FROM cernopendata/cernopendata-client:1.0.0 +FROM python:3.10 LABEL maintainer="Gordon Watts " @@ -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 diff --git a/did_finder_cernopendata/poetry.lock b/did_finder_cernopendata/poetry.lock index 29bea2309..e64eb6431 100644 --- a/did_finder_cernopendata/poetry.lock +++ b/did_finder_cernopendata/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand. [[package]] name = "amqp" @@ -84,6 +84,28 @@ yaml = ["PyYAML (>=3.10)"] zookeeper = ["kazoo (>=1.3.1)"] zstd = ["zstandard (==0.22.0)"] +[[package]] +name = "cernopendata-client" +version = "1.0.0" +description = "cernopendata-client." +optional = false +python-versions = ">=3.8" +groups = ["main"] +files = [ + {file = "cernopendata_client-1.0.0.tar.gz", hash = "sha256:b336e42b7447270d15faa7a05f43fc6d3064664afa181a1777e246aa2997091d"}, +] + +[package.dependencies] +click = ">=7" +requests = ">=2" + +[package.extras] +all = ["Sphinx (>=1.4.4)", "Sphinx (>=1.4.4)", "black (>=19.10b0)", "black (>=19.10b0)", "check-manifest (>=0.25)", "check-manifest (>=0.25)", "coverage (>=4.0)", "coverage (>=4.0)", "jinja2 (<3.1.0)", "jinja2 (<3.1.0)", "mock (>=3.0)", "mock (>=3.0)", "myst-parser", "myst-parser", "pycurl (>=7)", "pycurl (>=7)", "pydocstyle (>=1.0.0)", "pydocstyle (>=1.0.0)", "pytest (>=2.8.0)", "pytest (>=2.8.0)", "pytest-cov (>=1.8.0)", "pytest-cov (>=1.8.0)", "pytest-mock (>=3.0)", "pytest-mock (>=3.0)", "sphinx-click (>=2.5.0)", "sphinx-click (>=2.5.0)", "sphinx-rtd-theme (>=0.1.9)", "sphinx-rtd-theme (>=0.1.9)", "xrootd (>=4.12.2)", "xrootd (>=4.12.2)"] +docs = ["Sphinx (>=1.4.4)", "jinja2 (<3.1.0)", "myst-parser", "sphinx-click (>=2.5.0)", "sphinx-rtd-theme (>=0.1.9)"] +pycurl = ["pycurl (>=7)"] +tests = ["black (>=19.10b0)", "check-manifest (>=0.25)", "coverage (>=4.0)", "mock (>=3.0)", "pydocstyle (>=1.0.0)", "pytest (>=2.8.0)", "pytest-cov (>=1.8.0)", "pytest-mock (>=3.0)"] +xrootd = ["xrootd (>=4.12.2)"] + [[package]] name = "certifi" version = "2024.7.4" @@ -698,4 +720,4 @@ files = [ [metadata] lock-version = "2.1" python-versions = "~3.10" -content-hash = "2bb50166fe66ef1e654abc4bd7538c5a2dae914447aea2d2afb5f393483f385c" +content-hash = "6ddb300f576e2d034eb11750165fe4e001c7e5680cde4a33f9949ab5c8dee7aa" diff --git a/did_finder_cernopendata/pyproject.toml b/did_finder_cernopendata/pyproject.toml index 8e40d15f8..30c8d4c58 100644 --- a/did_finder_cernopendata/pyproject.toml +++ b/did_finder_cernopendata/pyproject.toml @@ -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] From 09b836bdadf13852be7a7d3455f285dd38d1a63d Mon Sep 17 00:00:00 2001 From: Peter Onyisi Date: Sat, 15 Nov 2025 18:31:38 -0600 Subject: [PATCH 4/4] remove commented code --- did_finder_cernopendata/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/did_finder_cernopendata/Dockerfile b/did_finder_cernopendata/Dockerfile index 206acdf7a..f05725deb 100644 --- a/did_finder_cernopendata/Dockerfile +++ b/did_finder_cernopendata/Dockerfile @@ -12,12 +12,6 @@ RUN useradd -g 0 -ms /bin/bash celery ENV POETRY_VERSION=2.1.1 -# There is a bug in poetry with no virtual env where it can delete this package -# 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 install poetry==$POETRY_VERSION COPY pyproject.toml pyproject.toml