Skip to content
Merged
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
1 change: 1 addition & 0 deletions construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ specs:
- pytest
- recommonmark
- authlib >=1.0.0
- joserfc
- pyjwt
- dominate
- httpx
Expand Down
17 changes: 8 additions & 9 deletions create_diracosrc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down