Skip to content

fix: Clone DIRACGrid/DIRAC in the integration tests again #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisburr merged 2 commits into from
Aug 31, 2026
+8 −5
Merged

fix: Clone DIRACGrid/DIRAC in the integration tests again #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
644b41f
fix: Clone DIRACGrid/DIRAC in the integration tests again
chrisburr Aug 31, 2026
7eb2d63
fix: Pin m2crypto <0.46 to avoid a broken ssl_read()
chrisburr Aug 31, 2026
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
5 changes: 1 addition & 4 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,7 @@ jobs:
- name: Prepare environment
run: |
pip install typer pyyaml gitpython packaging
# HACK: DO NOT MERGE - clone the plot-test fix branches instead of the real ones
git clone https://github.com/chrisburr/DIRAC.git -b "fix/plot-tests-numpy-bins-${DIRAC_BRANCH#rel-}" DIRACRepo
env:
DIRAC_BRANCH: ${{ matrix.dirac-branch }}
git clone https://github.com/DIRACGrid/DIRAC.git -b "${{ matrix.dirac-branch }}" DIRACRepo
- name: Run tests
run: |
DIRACOS_TARBALL_PATH=$(echo ${PWD}/DIRACOS-*.sh)
Expand Down
8 changes: 7 additions & 1 deletion construct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ specs:
- openssl >=3
# Security
- certifi
- m2crypto >=0.43
# Upper pin: m2crypto 0.46.0 rewrote ssl_read() in src/SWIG/_ssl.i and inverted the
# handling of ssl_sleep_with_timeout()'s return value (and dropped the gettimeofday()
# that initialises the deadline). Any read() on a connection with a timeout set now
# busy-loops and returns with a stale SSLTimeoutError set, which surfaces as
# "SystemError: <built-in function ssl_read> returned a result with an exception set"
# and breaks all DIRAC DISET/dips connections. Still unfixed upstream as of 0.49.0.
- m2crypto >=0.43,<0.46
- pyasn1 >0.4.1
- pyasn1-modules
- tornado_m2crypto >=0.1.4
Expand Down