From 97510103ab91f8237bd6faca3916d5b35aeae6ba Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Thu, 15 Jan 2026 17:13:34 +0100 Subject: [PATCH 1/5] Update Python version from 3.11 to 3.14 --- construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/construct.yaml b/construct.yaml index 479878d..b89f5b3 100644 --- a/construct.yaml +++ b/construct.yaml @@ -34,7 +34,7 @@ ignore_duplicate_files: true # happening when an old version has incorrect version pins specs: - micromamba - - python 3.11.* + - python 3.14.* - openssl >=3 # Security # certifi >=2026.10.19 and ca-certificates >=2026.10.19 remove the emSign roots From 6e4a35967a2894ec2cf763719c582c87092c9722 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Thu, 22 Jan 2026 21:08:06 +0100 Subject: [PATCH 2/5] Removed obsolete elasticsearch package constraints --- construct.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/construct.yaml b/construct.yaml index b89f5b3..403876c 100644 --- a/construct.yaml +++ b/construct.yaml @@ -52,11 +52,7 @@ specs: - opensearch-py - opensearch-dsl - mysql-client - # elasticsearch packages can be removed once DIRAC 7.3 is not used anymore - replaced by opensearch - # They can't actually be removed yet as DIRAC stil has it in the dependencies - - elasticsearch <7.14 - - elasticsearch-dsl - - numpy <2 # elasticsearch<7.14 needs numpy 1.x, remove this constraint when elasticsearch is removed + - numpy - mysqlclient >=2.2.0 - sqlalchemy >=1.4.36 - stomp.py >8 From 1c7a62aef4e1c3e21488bce7e3db75a8491de9c1 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Thu, 22 Jan 2026 21:51:59 +0100 Subject: [PATCH 3/5] fix: Disable fail-fast for build-installer jobs Allow all platform builds to complete independently so that a failure on one platform doesn't cancel the others. --- .github/workflows/build-and-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3f23832..fa8cb06 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,6 +19,7 @@ jobs: if: github.repository == 'DIRACGrid/DIRACOS2' runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: include: - target_arch: linux-64 From 234606e5ccca1f7277c078e5d8fb511771a2ba9e Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Thu, 9 Jul 2026 15:26:18 +0200 Subject: [PATCH 4/5] fix: Enable rrdtool on osx-arm64 now that builds are available --- construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/construct.yaml b/construct.yaml index 403876c..3bfaa8b 100644 --- a/construct.yaml +++ b/construct.yaml @@ -94,7 +94,7 @@ specs: - python-json-logger >=0.1.8 - pytz >=2015.7 - requests >=2.9.1 - - rrdtool # [not (osx and arm64)] + - rrdtool - apptainer >=1.3.6 # [not osx] # pin setuptools for installing all v8 releases not patched with https://github.com/DIRACGrid/DIRAC/pull/8492/changes - setuptools <82.0 From 80914263d420cc7e9e15ec1506af2a77810c1a80 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Thu, 9 Jul 2026 15:43:34 +0200 Subject: [PATCH 5/5] fix: Drop cgi, imp and elasticsearch_dsl from import tests for Python 3.14 --- .github/workflows/build-and-test.yml | 9 +++++++++ tests/test_import.py | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fa8cb06..81c3d15 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -188,6 +188,15 @@ jobs: - integration steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: Free up disk space + # The integration tests install DIRACOS twice (server + client) on the + # same runner. The Python 3.14 environment is large enough that the + # second install can exhaust the default runner disk, so remove some of + # the bulky pre-installed toolchains we don't need. + run: | + df -h / + sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc /usr/local/share/boost + df -h / - uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0 with: python-version: '3.15' diff --git a/tests/test_import.py b/tests/test_import.py index 0a9e99d..5cda68b 100644 --- a/tests/test_import.py +++ b/tests/test_import.py @@ -49,7 +49,6 @@ "bz2", "calendar", "certifi", - "cgi", "cmd", "collections", "contextlib", @@ -59,7 +58,6 @@ "difflib", "distutils.spawn", "elasticsearch", - "elasticsearch_dsl", "errno", "fcntl", "filecmp", @@ -76,7 +74,6 @@ "hashlib", "http.client", "hypothesis", - "imp", "importlib", "inspect", "io",