From c43c66fd3e87868be08bc4920352662c1751fca5 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 10:35:12 -0500 Subject: [PATCH 01/48] DEV-3737 testing matrix builds --- .github/workflows/ci.yaml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 679e890e..e731ab63 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,15 +14,15 @@ jobs: strategy: matrix: os: - - macos-12 - - macos-13 - - macos-14 - - ubuntu-20.04 - - ubuntu-22.04 - - windows-2019 - - windows-2022 + - macos-latest + - ubuntu-latest + - windows-latest python: - - 3.8 + - 3.10 + - 3.11 + - 3.12 + - 3.13 + - 3.14 env: GDC_CLIENT_ZIP: 'gdc-client.zip' steps: @@ -34,17 +34,15 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python }} + - name: Install uv + uses: astral-sh/setup-uv@5 - name: Run Tests - if: matrix.os != 'windows-latest' - run: | - pip install --upgrade pip - pip install tox - tox -e py + run: uv run pytest tests/ - name: Package run: | cd bin - pip install virtualenv - . ./package + uv pip install virtualenv + uv run ../package echo "GDC_CLIENT_ZIP=$GDC_CLIENT_ZIP" >> $GITHUB_ENV shell: bash - uses: actions/upload-artifact@v4 From a4dc9f3b9dc1b886f7ba99153f7f7a5f8e374431 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 10:38:50 -0500 Subject: [PATCH 02/48] DEV-3737 more testing of matrix stuff --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e731ab63..c6bf6b9e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,6 +5,7 @@ on: - develop - release/** - hotfix/** + - test-ci-matrix-upgrade tags: - '*' From 09bf43db9a5b095ca66a3db27abe8c3d2c39386e Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 10:42:03 -0500 Subject: [PATCH 03/48] DEV-3737 Matrix building is fun (for real) --- .github/workflows/ci.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c6bf6b9e..e2a921a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,11 +19,11 @@ jobs: - ubuntu-latest - windows-latest python: - - 3.10 - - 3.11 - - 3.12 - - 3.13 - - 3.14 + - "3.10" + - "3.11" + - "3.12" + - "3.13" + - "3.14" env: GDC_CLIENT_ZIP: 'gdc-client.zip' steps: @@ -36,7 +36,7 @@ jobs: with: python-version: ${{ matrix.python }} - name: Install uv - uses: astral-sh/setup-uv@5 + uses: astral-sh/setup-uv@9.0.0 - name: Run Tests run: uv run pytest tests/ - name: Package From 6aed7a2f195f7340e81468eab645041bf4bc3db0 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 10:45:09 -0500 Subject: [PATCH 04/48] DEV-3737 fix typos --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e2a921a7..1978f9a1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,7 @@ jobs: build: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: - macos-latest @@ -36,7 +37,7 @@ jobs: with: python-version: ${{ matrix.python }} - name: Install uv - uses: astral-sh/setup-uv@9.0.0 + uses: astral-sh/setup-uv@v9.0.0 - name: Run Tests run: uv run pytest tests/ - name: Package From d3cae07885b914f6273ae0f78730c232305e3f0a Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 10:49:26 -0500 Subject: [PATCH 05/48] DEV-3737 Get uv setup before tests --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1978f9a1..3c026fec 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,6 +38,8 @@ jobs: python-version: ${{ matrix.python }} - name: Install uv uses: astral-sh/setup-uv@v9.0.0 + - name: Install dependencies + run: uv sync - name: Run Tests run: uv run pytest tests/ - name: Package From 74214f092a5f883543eab4bf94f3d17f06a482c9 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 10:55:55 -0500 Subject: [PATCH 06/48] DEV-3737 Deal with pip to uv changes --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3c026fec..26cfbe1d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv sync + run: uv sync --no-config - name: Run Tests run: uv run pytest tests/ - name: Package From 2dc9fcd66d287ca55e92cec4abd94ddfdcfa739d Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:00:20 -0500 Subject: [PATCH 07/48] DEV-3737 Deal with pip to uv changes in a different way --- .github/workflows/ci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 26cfbe1d..ac00cb4b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,9 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv sync --no-config + run: uv sync + env: + UV_INDEX_URL: https://pypi.org - name: Run Tests run: uv run pytest tests/ - name: Package From f5939af822985a69b9f5dd0c81629c41accb6302 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:04:16 -0500 Subject: [PATCH 08/48] DEV-3737 Use better variable --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ac00cb4b..871e6607 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: - name: Install dependencies run: uv sync env: - UV_INDEX_URL: https://pypi.org + UV_DEFAULT_INDEX: https://pypi.org - name: Run Tests run: uv run pytest tests/ - name: Package From c35676ba4b2b9edb776bae2c4b94872c0aa19468 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:07:53 -0500 Subject: [PATCH 09/48] DEV-3737 Add missing slash --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 871e6607..f49262b7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: - name: Install dependencies run: uv sync env: - UV_DEFAULT_INDEX: https://pypi.org + UV_DEFAULT_INDEX: https://pypi.org/ - name: Run Tests run: uv run pytest tests/ - name: Package From 284c234dad698cb8f7e555b905ddec1aeae4b15d Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:11:30 -0500 Subject: [PATCH 10/48] DEV-3737 More uv work --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f49262b7..ef3cb7f9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv sync + run: uv sync --no-lock env: UV_DEFAULT_INDEX: https://pypi.org/ - name: Run Tests From 6aacf133fc924d93099298a78c81788dbc792fd4 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:14:07 -0500 Subject: [PATCH 11/48] DEV-3737 Another stab at uv --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ef3cb7f9..ca7c43ad 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv sync --no-lock + run: uv pip install -e . env: UV_DEFAULT_INDEX: https://pypi.org/ - name: Run Tests From e844d517f19edf396d513434efa889ba66fd82e4 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:17:32 -0500 Subject: [PATCH 12/48] DEV-3737 Pip and uv --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ca7c43ad..859e65fd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv pip install -e . + run: uv pip install --system -e . env: UV_DEFAULT_INDEX: https://pypi.org/ - name: Run Tests From 0335997cbce451eaebd433f7a9dec154c9ba2a18 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:19:55 -0500 Subject: [PATCH 13/48] DEV-3737 More testing --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 859e65fd..f2ea3239 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,9 +39,9 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv pip install --system -e . + run: uv pip install --system --no-build-isolation -e . env: - UV_DEFAULT_INDEX: https://pypi.org/ + UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests run: uv run pytest tests/ - name: Package From abb88a32b348853c4810fecfc2412c8d5fcce794 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:24:12 -0500 Subject: [PATCH 14/48] DEV-3737 Get things there when needed --- .github/workflows/ci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f2ea3239..3a61b2f0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,9 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv pip install --system --no-build-isolation -e . + run: | + uv pip install --system setuptools setuptools-scm + uv pip install --system --no-build-isolation -e . env: UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests From ab6aa2b7291ce05e1f0a217c36ffc80cbdd56d3d Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:31:07 -0500 Subject: [PATCH 15/48] DEV-3737 Help setuptools find license --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 989723e8..28999557 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ dependencies = [ description = "Queue Client Facade: A generalized API that allows for connection to multiple queue implementations." dynamic = ["version"] keywords = ["rabbitmq", "depot"] -license-files = ["LICENSE"] maintainers = [ {name = "GDC Feature Team", email = "gdc_dev_questions-aaaaae2lhsbell56tlvh3upgoq@cdis.slack.com"} ] @@ -105,6 +104,9 @@ select = [ [tool.ruff.lint.per-file-ignores] "**/portability.py" = ["F401"] +[tool.setuptools] +license-files = ["LICENSE"] + [tool.setuptools_scm] fallback_version = "0.0.0" From 4ce7a3d9bf61a6796cbfe33aabe93b6a705140c0 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:38:28 -0500 Subject: [PATCH 16/48] DEV-3737 More uv testing --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3a61b2f0..f37bee56 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,8 +40,7 @@ jobs: uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies run: | - uv pip install --system setuptools setuptools-scm - uv pip install --system --no-build-isolation -e . + uv pip install -e .[dev] env: UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests From eb72e7fc909217d4ceeaa76904c25b656a426685 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:41:01 -0500 Subject: [PATCH 17/48] DEV-3737 More uv work --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f37bee56..e6b3b94f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,8 +39,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: | - uv pip install -e .[dev] + run: uv sync --extra dev env: UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests From 3c396980b729d5a6707a4b34b21ddfbb101ab422 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:53:55 -0500 Subject: [PATCH 18/48] DEV-3737 Mac connection work --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e6b3b94f..958a067d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,6 +43,8 @@ jobs: env: UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests + env: + NO_PROXY: "127.0.0.1,localhost" run: uv run pytest tests/ - name: Package run: | From b312f1e29c3af4f8592aacb2526e49c5f7b92e66 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 11:57:42 -0500 Subject: [PATCH 19/48] DEV-3737 Add more no_proxy --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 958a067d..5bfcc872 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -45,6 +45,7 @@ jobs: - name: Run Tests env: NO_PROXY: "127.0.0.1,localhost" + no proxy: "127.0.0.1,localhost" run: uv run pytest tests/ - name: Package run: | From edad78be9ee0fb351543ed1cf93775a9fec7b414 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 12:08:19 -0500 Subject: [PATCH 20/48] DEV-3737 Work with macos networking changes --- tests/conftest.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 64534f3f..1ac32842 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,10 +1,10 @@ import hashlib import hmac +import multiprocessing import tarfile import time from collections.abc import Iterable, Mapping from io import BytesIO -from multiprocessing import Process from unittest.mock import patch import boto3 @@ -141,11 +141,18 @@ def run_mock_server(): @pytest.fixture(scope="class") def setup_mock_server() -> None: - server = Process(target=run_mock_server) + try: + ctx = multiprocessing.get_context("fork") + server = ctx.Process(target=run_mock_server) + except ValueError: + server = multiprocessing.Process(target=run_mock_server) + server.start() - time.sleep(5) # starting with py38, takes longer for process to start on macOS + # originally set to 5 for py38 and macos, up to 10 for macos py310 + time.sleep(10) yield server.terminate() + server.join() @pytest.fixture From 4331cbfcbd47008bd3f69dd0ee649d0c4c896469 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 12:12:45 -0500 Subject: [PATCH 21/48] DEV-3737 more value tempering --- tests/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 1ac32842..b9709f4e 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -149,7 +149,8 @@ def setup_mock_server() -> None: server.start() # originally set to 5 for py38 and macos, up to 10 for macos py310 - time.sleep(10) + # need something better if this works + time.sleep(30) yield server.terminate() server.join() From 0fb80f4e1f12e5b4951056d7d49ffc2785ee461e Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 12:42:05 -0500 Subject: [PATCH 22/48] DEV-3737 Write a better waiting loop --- tests/conftest.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index b9709f4e..c09e6be9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,6 +3,8 @@ import multiprocessing import tarfile import time +import urllib.error +import urllib.request from collections.abc import Iterable, Mapping from io import BytesIO from unittest.mock import patch @@ -141,6 +143,7 @@ def run_mock_server(): @pytest.fixture(scope="class") def setup_mock_server() -> None: + # MacOS does things differently, so get everyone acting the same way try: ctx = multiprocessing.get_context("fork") server = ctx.Process(target=run_mock_server) @@ -148,9 +151,21 @@ def setup_mock_server() -> None: server = multiprocessing.Process(target=run_mock_server) server.start() - # originally set to 5 for py38 and macos, up to 10 for macos py310 - # need something better if this works - time.sleep(30) + + # Since py38, a sleep is needed for MacOS. 10 is no longer enough as of py310 + # Instead of time.sleep(30), this loop could exit faster. + for _ in range(60): + try: + with urllib.request.urlopen("http://127.0.0.1:5000", timeout=1): + break + # listen for any response, and then stop waiting + except urllib.error.HTTPError: + break + except Exception: + time.sleep(0.5) + else: + raise RuntimeError("Mock server failed to start on 127.0.0.1:5000 in 30 secs.") + yield server.terminate() server.join() From 02fedb5b4254179c9d56047f66e39720cfe4aefd Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 13:11:06 -0500 Subject: [PATCH 23/48] DEV-3737 Fix typo and move more to uv --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5bfcc872..ec9a1e02 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,8 +50,7 @@ jobs: - name: Package run: | cd bin - uv pip install virtualenv - uv run ../package + uv run --with virtualenv bash ./package echo "GDC_CLIENT_ZIP=$GDC_CLIENT_ZIP" >> $GITHUB_ENV shell: bash - uses: actions/upload-artifact@v4 From 347511ba038745a4b28ee31463a12062244f56f8 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 13:28:54 -0500 Subject: [PATCH 24/48] DEV-3737 More uv migration --- .github/workflows/ci.yaml | 2 +- bin/package | 75 ++++++--------------------------------- 2 files changed, 12 insertions(+), 65 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ec9a1e02..6e501598 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,7 +50,7 @@ jobs: - name: Package run: | cd bin - uv run --with virtualenv bash ./package + uv run bash ./package echo "GDC_CLIENT_ZIP=$GDC_CLIENT_ZIP" >> $GITHUB_ENV shell: bash - uses: actions/upload-artifact@v4 diff --git a/bin/package b/bin/package index 079b7fa1..75adad55 100755 --- a/bin/package +++ b/bin/package @@ -1,14 +1,6 @@ #!/usr/bin/env bash - set -euox pipefail -function cleanup() { - # get rid of the virtualenv - echo "Cleaning up" - deactivate - rm -rf "${VENV_NAME:?}/" build/ dist/ include/ local/ share/ gdc-client.spec -} - function compress() { # this way it's cross platform local zip_name=$1 @@ -24,76 +16,35 @@ with ZipFile('${zip_name}', 'w') as z: while getopts ":d" opt; do case $opt in - d) - DATE=$(date "+%m_%d_%Y") - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - ;; - esac + d) DATE=$(date "+%m_%d_%Y") ;; + \?) echo "Invalid option: -$OPTARG" >&2 ;; + esac done DATE=${DATE-} # if date is not passed in, default DATE variable to empty string -VENV_NAME="venv" BINARY_NAME="gdc-client" -VENV_PATH="$VENV_NAME/bin/activate" - -case $(uname -s) in - *NT*) - # for use in git bash with all the nice unix utilities - TARGET_ENVIRONMENT="Windows" - BINARY_NAME="gdc-client.exe" - - # this works in git bash - alias python="winpty python" - - # why does windows have to be so different? - VENV_PATH="$VENV_NAME/Scripts/activate" - # Presumably Python3 is the only `python` in the Windows %PATH% variable - python -m virtualenv "$VENV_NAME" - source "$VENV_PATH" - pip install pywin32 - ;; - *Linux*) - TARGET_ENVIRONMENT="Ubuntu" - python -m virtualenv "$VENV_NAME" --python=python3 - source "$VENV_PATH" - ;; - *Darwin*) - TARGET_ENVIRONMENT="OSX" - python -m virtualenv "$VENV_NAME" --python=python3 - source "$VENV_PATH" - ;; +case "$(uname -s)" in + *NT*) TARGET_ENVIRONMENT="Windows"; BINARY_NAME="gdc-client.exe" ;; + *Linux*) TARGET_ENVIRONMENT="Ubuntu" ;; + *Darwin*) TARGET_ENVIRONMENT="OSX" ;; + *) echo "Unsupported OS"; exit 1 ;; esac # setup.py is in previous dir cd .. -python -m pip install --upgrade pip -python -m pip install --no-deps -r requirements.txt -python -m pip install --no-deps . +uv sync --locked --extra dev -# go back go the ./gdc_client/bin dir cd bin echo "Building for ${TARGET_ENVIRONMENT}..." - -# Make sure the correct version of pyinstaller and setuptools are installed -pip install -U PyInstaller - -# Ran into ModuleNotFoundError: No module named 'pkg_resources.py2_warn' with higher versions of setuptools -pip install --upgrade setuptools - # Get version -VERSION=$(python -c " +VERSION=$(uv run python -c " import gdc_client.version print(gdc_client.version.__version__)") -echo "Creating ${TARGET_ENVIRONMENT} package for version ${VERSION}..." - -# Create binary -pyinstaller \ +uv run --with pyinstaller pyinstaller \ --clean \ --additional-hooks-dir=. \ --noconfirm \ @@ -118,7 +69,3 @@ ZIP_NAME="$PRE_ZIP_NAME.zip" echo "The output zip file will be called ${ZIP_NAME}" compress "$ZIP_NAME" "$BINARY_NAME" mv "$ZIP_NAME" .. -cd .. - -cleanup -export GDC_CLIENT_ZIP="$PRE_ZIP_NAME" From de5b35e67ec50e8107c42909cb86476bde548be0 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 13:35:23 -0500 Subject: [PATCH 25/48] DEV-3737 Small change with newer python versions --- src/gdc_client/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gdc_client/version.py b/src/gdc_client/version.py index 894cfbac..5aba7afb 100644 --- a/src/gdc_client/version.py +++ b/src/gdc_client/version.py @@ -1,3 +1,3 @@ -from importlib_metadata import version +from importlib.metadata import version __version__ = version("gdc_client") From 9bfd2d5e02538caee04d2504b7332aa34ab63d8d Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 15:25:26 -0500 Subject: [PATCH 26/48] DEV-3737 Remove possible unneeded changes --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6e501598..5e63f485 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,6 @@ jobs: build: runs-on: ${{ matrix.os }} strategy: - fail-fast: false matrix: os: - macos-latest @@ -41,7 +40,7 @@ jobs: - name: Install dependencies run: uv sync --extra dev env: - UV_DEFAULT_INDEX: https://pypi.org/simple +# UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests env: NO_PROXY: "127.0.0.1,localhost" From f41166c26280f3ecf356f243fe976b35c307a01c Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 15:26:17 -0500 Subject: [PATCH 27/48] DEV-3737 Remove possible unneeded change correctly --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5e63f485..ebfb8373 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies run: uv sync --extra dev - env: +# env: # UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests env: From a33a562f0ae1a84b284ca6e5f564feccacbfe9aa Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 15:27:33 -0500 Subject: [PATCH 28/48] DEV-3737 Test another change --- .github/workflows/ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ebfb8373..6a5a264e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,12 +39,12 @@ jobs: uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies run: uv sync --extra dev -# env: -# UV_DEFAULT_INDEX: https://pypi.org/simple - - name: Run Tests env: - NO_PROXY: "127.0.0.1,localhost" - no proxy: "127.0.0.1,localhost" + UV_DEFAULT_INDEX: https://pypi.org/simple + - name: Run Tests +# env: +# NO_PROXY: "127.0.0.1,localhost" +# no proxy: "127.0.0.1,localhost" run: uv run pytest tests/ - name: Package run: | From 416644aa46928021953cab314d76e85603fd97d3 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Mon, 10 Aug 2026 15:28:50 -0500 Subject: [PATCH 29/48] DEV-3737 Restore changes that were needed --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a5a264e..90d5d703 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,9 +42,9 @@ jobs: env: UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests -# env: -# NO_PROXY: "127.0.0.1,localhost" -# no proxy: "127.0.0.1,localhost" + env: + NO_PROXY: "127.0.0.1,localhost" + no proxy: "127.0.0.1,localhost" run: uv run pytest tests/ - name: Package run: | From ceadbab0649870a823605007a650fb6b63395bcb Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 08:44:12 -0500 Subject: [PATCH 30/48] DEV-3737 Remove testing line --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 90d5d703..d6fd5211 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,7 +5,6 @@ on: - develop - release/** - hotfix/** - - test-ci-matrix-upgrade tags: - '*' From 97c5375548bad6bc1d370a4eb3fcc1733c3b6ce4 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 09:27:43 -0500 Subject: [PATCH 31/48] DEV-3737 Use a more robust set of OS options --- .github/workflows/ci.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d6fd5211..c0d00cb5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,6 +5,7 @@ on: - develop - release/** - hotfix/** + - feat/DEV-3737_Matrix_update tags: - '*' @@ -14,9 +15,14 @@ jobs: strategy: matrix: os: - - macos-latest + - macos-14 + - macos-15 + - macos-26 - ubuntu-latest - - windows-latest + - ubuntu-22.04 + - ubuntu-24.04 + - windows-2022 + - windows-2025 python: - "3.10" - "3.11" From ba2c0c2465acf03736b66d2ec0cb2d33d6224a49 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 09:48:09 -0500 Subject: [PATCH 32/48] DEV-3737 Remove final ambiguous OS --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c0d00cb5..1da421e8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,7 +18,6 @@ jobs: - macos-14 - macos-15 - macos-26 - - ubuntu-latest - ubuntu-22.04 - ubuntu-24.04 - windows-2022 From 73cdce030d0ba9c2e7e47c2364494779d4e62b57 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 11:25:21 -0500 Subject: [PATCH 33/48] DEV-3737 Move project information back to project --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 62ae5de3..705f5a8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=64", "setuptools_scm>=8"] +requires = ["setuptools>=80", "setuptools_scm>=8"] build-backend = "setuptools.build_meta" [project] @@ -29,6 +29,7 @@ dependencies = [ description = "Queue Client Facade: A generalized API that allows for connection to multiple queue implementations." dynamic = ["version"] keywords = ["rabbitmq", "depot"] +license-files = ["LICENSE"] maintainers = [ {name = "GDC Feature Team", email = "gdc_dev_questions-aaaaae2lhsbell56tlvh3upgoq@cdis.slack.com"} ] From 8a60af26438b105448f57a497626003dded60657 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 11:27:28 -0500 Subject: [PATCH 34/48] DEV-3737 Isolate issues --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 705f5a8d..da0b5d4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ dependencies = [ description = "Queue Client Facade: A generalized API that allows for connection to multiple queue implementations." dynamic = ["version"] keywords = ["rabbitmq", "depot"] -license-files = ["LICENSE"] maintainers = [ {name = "GDC Feature Team", email = "gdc_dev_questions-aaaaae2lhsbell56tlvh3upgoq@cdis.slack.com"} ] @@ -102,6 +101,9 @@ select = [ "W" # pydocstyle warnings ] +[tool.setuptools] +license-files = ["LICENSE"] + [tool.setuptools_scm] fallback_version = "0.0.0" From 1d2b8262dd1d5093772cb9e7245e8b93b2fbcca0 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 11:39:40 -0500 Subject: [PATCH 35/48] DEV-3737 Try to work with newer setuptools --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index da0b5d4d..705f5a8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ dependencies = [ description = "Queue Client Facade: A generalized API that allows for connection to multiple queue implementations." dynamic = ["version"] keywords = ["rabbitmq", "depot"] +license-files = ["LICENSE"] maintainers = [ {name = "GDC Feature Team", email = "gdc_dev_questions-aaaaae2lhsbell56tlvh3upgoq@cdis.slack.com"} ] @@ -101,9 +102,6 @@ select = [ "W" # pydocstyle warnings ] -[tool.setuptools] -license-files = ["LICENSE"] - [tool.setuptools_scm] fallback_version = "0.0.0" From b798bc3952cfcfe8d8b27c5fc5584bc4e019ee3c Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 11:47:24 -0500 Subject: [PATCH 36/48] DEV-3737 Reduce unneeded libraries --- .github/workflows/ci.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1da421e8..b89e3826 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,10 +41,6 @@ jobs: python-version: ${{ matrix.python }} - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - - name: Install dependencies - run: uv sync --extra dev - env: - UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests env: NO_PROXY: "127.0.0.1,localhost" From 0e89471c2c954a6ced22c58f9e22dc2a1716e61d Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 11:56:30 -0500 Subject: [PATCH 37/48] DEV-3737 Remove unneeded packages --- .github/workflows/ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b89e3826..db1ba78d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,6 +41,10 @@ jobs: python-version: ${{ matrix.python }} - name: Install uv uses: astral-sh/setup-uv@v9.0.0 + - name: Install dependencies + run: uv sync + env: + UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests env: NO_PROXY: "127.0.0.1,localhost" From d32691388db31609d1a8119b8ac5c0520218837e Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 11:59:25 -0500 Subject: [PATCH 38/48] DEV-3737 Add packages as needed --- .github/workflows/ci.yaml | 2 +- pyproject.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index db1ba78d..3be6f043 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,7 +42,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv sync + run: uv sync --extra build env: UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests diff --git a/pyproject.toml b/pyproject.toml index 705f5a8d..2af05c34 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,9 @@ readme = "README.md" requires-python = ">=3.10" [project.optional-dependencies] +build = [ + "pytest", +] dev = [ "click>=8", "flask", From ecb0e9408ebf510cd27b705e321e652bae37979b Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 12:43:18 -0500 Subject: [PATCH 39/48] DEV-3737 Improve library usage --- .github/workflows/ci.yaml | 4 ++-- bin/package | 2 +- pyproject.toml | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3be6f043..b552cd05 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,14 +42,14 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Install dependencies - run: uv sync --extra build + run: uv sync env: UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests env: NO_PROXY: "127.0.0.1,localhost" no proxy: "127.0.0.1,localhost" - run: uv run pytest tests/ + run: uv run --with tox-uv tox - name: Package run: | cd bin diff --git a/bin/package b/bin/package index 75adad55..cc1f68e8 100755 --- a/bin/package +++ b/bin/package @@ -34,7 +34,7 @@ esac # setup.py is in previous dir cd .. -uv sync --locked --extra dev +uv sync --locked --no-dev --no-editable cd bin diff --git a/pyproject.toml b/pyproject.toml index 2af05c34..705f5a8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,9 +38,6 @@ readme = "README.md" requires-python = ">=3.10" [project.optional-dependencies] -build = [ - "pytest", -] dev = [ "click>=8", "flask", From 0dec6629fb6b8d0d75834207e92e3443774ede09 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 13:33:28 -0500 Subject: [PATCH 40/48] DEV-3737 Remove testing line --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b552cd05..c04a307d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,7 +5,6 @@ on: - develop - release/** - hotfix/** - - feat/DEV-3737_Matrix_update tags: - '*' From af68af5823f696b5abd30d5717b0967ad7d14c52 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 13:38:05 -0500 Subject: [PATCH 41/48] DEV-3737 Remove unneeded step --- .github/workflows/ci.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c04a307d..b68c274b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,6 +5,7 @@ on: - develop - release/** - hotfix/** + - feat/DEV-3737_Matrix_update tags: - '*' @@ -40,10 +41,6 @@ jobs: python-version: ${{ matrix.python }} - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - - name: Install dependencies - run: uv sync - env: - UV_DEFAULT_INDEX: https://pypi.org/simple - name: Run Tests env: NO_PROXY: "127.0.0.1,localhost" From 29fda5aafabbfb897a0ad8947ed254adc021d677 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 13:57:24 -0500 Subject: [PATCH 42/48] DEV-3737 Clean up command --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b68c274b..0e1bf7a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,8 +44,7 @@ jobs: - name: Run Tests env: NO_PROXY: "127.0.0.1,localhost" - no proxy: "127.0.0.1,localhost" - run: uv run --with tox-uv tox + run: uv run tox - name: Package run: | cd bin From 02650356b6f1de68f01c4428eadfd2a686ae085f Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 14:10:18 -0500 Subject: [PATCH 43/48] DEV-3737 Add simple network test --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0e1bf7a7..7140b20d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,6 +39,9 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python }} + - name: Test connection problem + run: | + curl -I --max-time 15 https://nexus.osdc.io/repository/pypi-all/packages/ - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Run Tests From 735551bb4646dbc55c07fb3b5b7c9b5121505622 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 14:11:20 -0500 Subject: [PATCH 44/48] DEV-3737 Use correct indentation --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7140b20d..f6534316 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,7 +40,7 @@ jobs: with: python-version: ${{ matrix.python }} - name: Test connection problem - run: | + run: | curl -I --max-time 15 https://nexus.osdc.io/repository/pypi-all/packages/ - name: Install uv uses: astral-sh/setup-uv@v9.0.0 From b8f4b8979e4e549a52dec08f68d9bde83d24b20c Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Tue, 11 Aug 2026 14:12:27 -0500 Subject: [PATCH 45/48] DEV-3737 Remove helpful but unneeded test --- .github/workflows/ci.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f6534316..0e1bf7a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,9 +39,6 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python }} - - name: Test connection problem - run: | - curl -I --max-time 15 https://nexus.osdc.io/repository/pypi-all/packages/ - name: Install uv uses: astral-sh/setup-uv@v9.0.0 - name: Run Tests From 16d595cb55e4c3154f0974ec69986131b196abd9 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Wed, 12 Aug 2026 13:17:16 -0500 Subject: [PATCH 46/48] DEV-3737 Test moving to gitlab --- .gitlab-ci.yml | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce984552..bebce3fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,10 +6,45 @@ include: - templates/artifacts/python-library.yaml variables: - LANGUAGE_VERSION: python3.10 PYTHON_MULTIPROCESSING_START_METHOD: "fork" + GDC_CLIENT_ZIP: "gdc-client.zip" tox: parallel: matrix: - LANGUAGE_VERSION: [python3.10, python3.11, python3.12, python3.13, python3.14] + +.package_matrix: + stage: build-and-publish + parallel: + matrix: + - LANGUAGE_VERSION: [python3.10, python3.11, python3.12, python3.13, python3.14] + script: + - uv run tox + - cd bin + - uv run bash ./package + artifacts: + name: "gdc-client-${LANGUAGE_VERSION}-${OS_NAME}" + paths: + - bin/gdc-client_*.zip + +package_linux: + extends: .package_matrix + tags: + - linux + variables: + OS_NAME: linux + +package_macos: + extends: .package_matrix + tags: + - macos + variables: + OS_NAME: macos + +package_windows: + extends: .package_matrix + tags: + - windows + variables: + OS_NAME: windows From cd03bdcc49a27bcb02811bf6b37319584a714566 Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Wed, 12 Aug 2026 13:19:01 -0500 Subject: [PATCH 47/48] DEV-3737 Reduce load on github while testing --- .github/workflows/ci.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0e1bf7a7..59e30759 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,18 +16,18 @@ jobs: matrix: os: - macos-14 - - macos-15 - - macos-26 - - ubuntu-22.04 - - ubuntu-24.04 - - windows-2022 - - windows-2025 +# - macos-15 +# - macos-26 +# - ubuntu-22.04 +# - ubuntu-24.04 +# - windows-2022 +# - windows-2025 python: - "3.10" - - "3.11" - - "3.12" - - "3.13" - - "3.14" +# - "3.11" +# - "3.12" +# - "3.13" +# - "3.14" env: GDC_CLIENT_ZIP: 'gdc-client.zip' steps: From 4396843e42374c456cdcdcf5a20490871808909e Mon Sep 17 00:00:00 2001 From: Alexander Anderson Date: Thu, 13 Aug 2026 14:20:49 -0500 Subject: [PATCH 48/48] DEV-3737 Update code to match very helpful meeting --- .github/workflows/ci.yaml | 21 +++++++++++---------- .gitlab-ci.yml | 36 ------------------------------------ 2 files changed, 11 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 59e30759..a80915b8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,18 +16,18 @@ jobs: matrix: os: - macos-14 -# - macos-15 -# - macos-26 -# - ubuntu-22.04 -# - ubuntu-24.04 -# - windows-2022 -# - windows-2025 + - macos-15 + - macos-26 + - ubuntu-22.04 + - ubuntu-24.04 + - windows-2022 + - windows-2025 python: - "3.10" -# - "3.11" -# - "3.12" -# - "3.13" -# - "3.14" + - "3.11" + - "3.12" + - "3.13" + - "3.14" env: GDC_CLIENT_ZIP: 'gdc-client.zip' steps: @@ -44,6 +44,7 @@ jobs: - name: Run Tests env: NO_PROXY: "127.0.0.1,localhost" + UV_INDEX_URL: "https://pypi.org/simple" run: uv run tox - name: Package run: | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bebce3fb..2e5468d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,44 +7,8 @@ include: variables: PYTHON_MULTIPROCESSING_START_METHOD: "fork" - GDC_CLIENT_ZIP: "gdc-client.zip" tox: parallel: matrix: - LANGUAGE_VERSION: [python3.10, python3.11, python3.12, python3.13, python3.14] - -.package_matrix: - stage: build-and-publish - parallel: - matrix: - - LANGUAGE_VERSION: [python3.10, python3.11, python3.12, python3.13, python3.14] - script: - - uv run tox - - cd bin - - uv run bash ./package - artifacts: - name: "gdc-client-${LANGUAGE_VERSION}-${OS_NAME}" - paths: - - bin/gdc-client_*.zip - -package_linux: - extends: .package_matrix - tags: - - linux - variables: - OS_NAME: linux - -package_macos: - extends: .package_matrix - tags: - - macos - variables: - OS_NAME: macos - -package_windows: - extends: .package_matrix - tags: - - windows - variables: - OS_NAME: windows