From febdc9b414c2e23d9505da1a02c1cbbe78d76c13 Mon Sep 17 00:00:00 2001 From: Bill Dolinar Date: Mon, 10 Aug 2026 17:24:39 -0600 Subject: [PATCH 1/2] Regenerate CI workflows with xmsconan 2.15.4 --- .github/workflows/XmsGridtrace-CI.yaml | 38 ++++++++++++++++++-------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/.github/workflows/XmsGridtrace-CI.yaml b/.github/workflows/XmsGridtrace-CI.yaml index 12dbe86..e35d854 100644 --- a/.github/workflows/XmsGridtrace-CI.yaml +++ b/.github/workflows/XmsGridtrace-CI.yaml @@ -31,7 +31,7 @@ jobs: steps: # Checkout Sources - name: Checkout Source - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Setup Python - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v2 @@ -42,10 +42,15 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 flake8-docstrings flake8-bugbear flake8-import-order pep8-naming + pip install "xmsconan==2.15.4" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + # Generate .flake8 so CI lints with the same config developers use locally. + # Do not inline the flake8 settings here: that duplicates .flake8.jinja and + # the two copies drift apart silently. + - name: Generate Build Files + run: xmsconan_gen build.toml # Flake Code - name: Run Flake - run: | - flake8 --exclude .tox,.git,__pycache__,_package/tests/files/*,pydocs/source/conf.py,build,dist,tests/fixtures/*,*.pyc,*.egg-info,.cache,.eggs --ignore=D200,D212 --max-line-length=120 --docstring-convention google --isolated --import-order-style=appnexus --application-import-names=xms.gridtrace --application-package-names=xms --count --statistics _package + run: flake8 _package # ---------------------------------------------------------------------------------------------- # MAC @@ -94,7 +99,7 @@ jobs: clang --version # Checkout Sources - name: Checkout Source - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Setup Python - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 @@ -104,8 +109,11 @@ jobs: - name: Install Python Dependencies run: | python -m pip install --upgrade pip - pip install conan devpi-client wheel - python -m pip install --upgrade "xmsconan>=2.15.2" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + # conan is pinned to a patch series on purpose: a minor bump can change + # package_id computation and silently detach builds from the binaries + # already published to the remote. Bump this deliberately. + pip install "conan~=2.31.0" devpi-client wheel + python -m pip install --upgrade "xmsconan==2.15.4" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Conan - name: Setup Conan run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login --remove-conancenter @@ -234,12 +242,15 @@ jobs: steps: # Checkout Sources - name: Checkout Source - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Install Python Dependencies - name: Install Python Dependencies run: | - pip install conan devpi-client wheel - pip install --upgrade "xmsconan>=2.15.2" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + # conan is pinned to a patch series on purpose: a minor bump can change + # package_id computation and silently detach builds from the binaries + # already published to the remote. Bump this deliberately. + pip install "conan~=2.31.0" devpi-client wheel + pip install --upgrade "xmsconan==2.15.4" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Conan - name: Setup Conan run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login @@ -368,7 +379,7 @@ jobs: steps: # Checkout Sources - name: Checkout Source - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Setup Python - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 @@ -383,8 +394,11 @@ jobs: - name: Install Python Dependencies run: | python -m pip install --upgrade pip - pip install conan devpi-client wheel - python -m pip install --upgrade "xmsconan>=2.15.2" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + # conan is pinned to a patch series on purpose: a minor bump can change + # package_id computation and silently detach builds from the binaries + # already published to the remote. Bump this deliberately. + pip install "conan~=2.31.0" devpi-client wheel + python -m pip install --upgrade "xmsconan==2.15.4" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Visual Studio - name: Setup Visual Studio uses: microsoft/setup-msbuild@v2 From 0943242bd9098c6c83310b955e8d2b2b03fb6f7c Mon Sep 17 00:00:00 2001 From: Bill Dolinar Date: Tue, 11 Aug 2026 17:43:58 -0600 Subject: [PATCH 2/2] Pin new dependency versions and regenerate with xmsconan 2.16.0 xmscore 7.0.8 -> 7.0.11, xmsgrid 9.0.9 -> 9.0.10, xmsinterp 7.0.8 -> 7.0.9, xmsextractor 10.0.6 -> 10.0.7. All four are now built under conan~=2.31.0 (so their binaries resolve) and with xmsconan 2.16.0 (so their libraries carry the testing helpers this repo links). --- .github/workflows/XmsGridtrace-CI.yaml | 8 ++++---- build.toml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/XmsGridtrace-CI.yaml b/.github/workflows/XmsGridtrace-CI.yaml index e35d854..d2af8b3 100644 --- a/.github/workflows/XmsGridtrace-CI.yaml +++ b/.github/workflows/XmsGridtrace-CI.yaml @@ -42,7 +42,7 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 flake8-docstrings flake8-bugbear flake8-import-order pep8-naming - pip install "xmsconan==2.15.4" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + pip install "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Generate .flake8 so CI lints with the same config developers use locally. # Do not inline the flake8 settings here: that duplicates .flake8.jinja and # the two copies drift apart silently. @@ -113,7 +113,7 @@ jobs: # package_id computation and silently detach builds from the binaries # already published to the remote. Bump this deliberately. pip install "conan~=2.31.0" devpi-client wheel - python -m pip install --upgrade "xmsconan==2.15.4" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + python -m pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Conan - name: Setup Conan run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login --remove-conancenter @@ -250,7 +250,7 @@ jobs: # package_id computation and silently detach builds from the binaries # already published to the remote. Bump this deliberately. pip install "conan~=2.31.0" devpi-client wheel - pip install --upgrade "xmsconan==2.15.4" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Conan - name: Setup Conan run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login @@ -398,7 +398,7 @@ jobs: # package_id computation and silently detach builds from the binaries # already published to the remote. Bump this deliberately. pip install "conan~=2.31.0" devpi-client wheel - python -m pip install --upgrade "xmsconan==2.15.4" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + python -m pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Visual Studio - name: Setup Visual Studio uses: microsoft/setup-msbuild@v2 diff --git a/build.toml b/build.toml index 3b30de8..3886825 100644 --- a/build.toml +++ b/build.toml @@ -3,10 +3,10 @@ description = "Grid tracing library for XMS products" ci_type = "github" xms_dependencies = [ - { name = "xmscore", version = "7.0.8" }, - { name = "xmsgrid", version = "9.0.9" }, - { name = "xmsinterp", version = "7.0.8" }, - { name = "xmsextractor", version = "10.0.6" }, + { name = "xmscore", version = "7.0.11" }, + { name = "xmsgrid", version = "9.0.10" }, + { name = "xmsinterp", version = "7.0.9" }, + { name = "xmsextractor", version = "10.0.7" }, ] python_namespaced_dir = "gridtrace"