From eb851b5563f33aef0f94869e7c97414f51487970 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 23 Jun 2026 11:20:17 +0200 Subject: [PATCH 1/4] fix: bundle joserfc which is required by diracx-core diracx-core depends on joserfc for JOSE/JWT handling but it was not part of the DIRACOS bundle, so a fresh installation had to pull it (and its dependencies) from PyPI on first use. Closes #173 --- construct.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/construct.yaml b/construct.yaml index d898be1..ddf37f0 100644 --- a/construct.yaml +++ b/construct.yaml @@ -119,6 +119,7 @@ specs: - pytest - recommonmark - authlib >=1.0.0 + - joserfc - pyjwt - dominate - httpx From 4c6a0d2871d75052d8e181a65fc3ed4e8dad9058 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 23 Jun 2026 11:21:14 +0200 Subject: [PATCH 2/4] fix: stop silencing Python warnings in diracosrc Sourcing diracosrc set PYTHONWARNINGS=ignore, which globally suppressed all Python warnings (deprecations, etc.) for everything run in the environment. Remove it so warnings surface as expected. Closes #146 --- create_diracosrc.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/create_diracosrc.sh b/create_diracosrc.sh index 73ee1b5..f88b172 100644 --- a/create_diracosrc.sh +++ b/create_diracosrc.sh @@ -18,9 +18,6 @@ echo 'micromamba activate "$DIRACOS"' echo '[ "$__diracos_xtrace" = 1 ] && set -x; unset __diracos_xtrace' echo '' - echo '# Silence python warnings' - echo 'export PYTHONWARNINGS=ignore' - echo '' echo '# Davix options (will be default in the future)' echo 'export DAVIX_USE_LIBCURL=1' echo '# Disable caching redirection to avoid asking storage nodes instead of head nodes' From a291c814c259f12a62af3abacce505503250f8b4 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 23 Jun 2026 11:21:31 +0200 Subject: [PATCH 3/4] fix: keep certificate listing out of xtrace in diracosrc checkDir When diracosrc is sourced under 'set -x', checkDir expanded the full directory listing into the trace, so a CA certificate directory dumped every filename. xtrace was previously only disabled around the 'ls' itself; the subsequent emptiness test still expanded the captured list. Keep xtrace off through the whole check and only restore it before returning, so the listing never reaches the trace. --- create_diracosrc.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/create_diracosrc.sh b/create_diracosrc.sh index f88b172..2b93e74 100644 --- a/create_diracosrc.sh +++ b/create_diracosrc.sh @@ -39,14 +39,16 @@ echo ' if [ -z "${resolvedDir}" ]; then' echo ' return 1' echo ' fi' - echo ' # Silence xtrace so a traced "ls -A" on e.g. a CA cert dir does not dump thousands of lines' + echo ' # Silence xtrace so the directory listing (e.g. a CA cert dir with' + echo ' # thousands of files) is not expanded into the trace. xtrace stays off' + echo ' # through the emptiness test, which would otherwise dump every entry.' echo ' local _xt=0; case $- in *x*) _xt=1; set +x;; esac' - echo ' local _contents; _contents=$(ls -A "${resolvedDir}" 2>/dev/null)' - echo ' [ "$_xt" = 1 ] && set -x' - echo ' if [ -n "${_contents}" ]; then' - echo ' return 0' + echo ' local _ret=1' + echo ' if [ -n "$(ls -A "${resolvedDir}" 2>/dev/null)" ]; then' + echo ' _ret=0' echo ' fi' - echo ' return 1' + echo ' [ "$_xt" = 1 ] && set -x' + echo ' return "${_ret}"' echo '}' echo '' echo '# Add sanity check for X509_CERT_DIR variable' From 03d216017af55c60a4fdbe5b437e74879383ab5b Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 23 Jun 2026 11:21:43 +0200 Subject: [PATCH 4/4] chore: drop version constraint on ruamel.yaml build dependency The <0.19 upper bound is no longer needed; allow any version to be selected by the solver. --- pixi.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.toml b/pixi.toml index a80b6c9..ac452e3 100644 --- a/pixi.toml +++ b/pixi.toml @@ -14,7 +14,7 @@ conda-standalone = "*" jinja2 = "*" jsonschema = ">=4" pillow = ">=3.1" -"ruamel.yaml" = ">=0.11.14,<0.19" +"ruamel.yaml" = "*" [pypi-dependencies] constructor = { git = "https://github.com/chrisburr/constructor.git", branch = "fix/mkdir-conda-guard" }