Skip to content

fix: bundle joserfc and reduce diracosrc noise#189

Merged
chrisburr merged 4 commits into
DIRACGrid:mainfrom
chrisburr:fix/diracos-deps-and-diracosrc-noise
Jun 23, 2026
Merged

fix: bundle joserfc and reduce diracosrc noise#189
chrisburr merged 4 commits into
DIRACGrid:mainfrom
chrisburr:fix/diracos-deps-and-diracosrc-noise

Conversation

@chrisburr

Copy link
Copy Markdown
Member

Summary

  • Bundle joserfc (required by diracx-core) so a fresh DIRACOS install no longer pulls it, and its dependencies, from PyPI on first use.
  • Stop silencing Python warnings: sourcing diracosrc exported PYTHONWARNINGS=ignore, which globally suppressed all Python warnings for everything run in the environment.
  • Quieten diracosrc under set -x: checkDir expanded the full directory listing into the trace, so sourcing under xtrace dumped every certificate filename from a CA cert directory. xtrace now stays off through the emptiness test and is only restored before returning.
  • Drop the version constraint on the ruamel.yaml build dependency.

Closes #173
Closes #146

BEGINRELEASENOTES

FIX: bundle joserfc which is required by diracx-core (#173)
FIX: stop silencing all Python warnings when sourcing diracosrc (#146)
FIX: do not print every certificate when sourcing diracosrc under set -x
CHANGE: drop the version constraint on the ruamel.yaml build dependency

ENDRELEASENOTES

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 DIRACGrid#173
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 DIRACGrid#146
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.
The <0.19 upper bound is no longer needed; allow any version to be
selected by the solver.
@chrisburr chrisburr marked this pull request as ready for review June 23, 2026 12:23
@chrisburr chrisburr merged commit 73c3d8d into DIRACGrid:main Jun 23, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: diracx-core requires joserfc, but this is not included in diracos sourcing diracosrc disables all python warnings

1 participant