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 diff --git a/create_diracosrc.sh b/create_diracosrc.sh index 73ee1b5..2b93e74 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' @@ -42,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' 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" }