From c1fe79e42a10caf1a582590d7a12e8030a378a27 Mon Sep 17 00:00:00 2001 From: Gage Larsen Date: Fri, 14 Aug 2026 10:47:12 -0600 Subject: [PATCH] Bump xmscore to 7.0.12 and regenerate CI with xmsconan 2.18.0 Second library on the VS2019 bridge, after xmscore. Two coupled changes. **xmscore 7.0.11 -> 7.0.12.** xms_dependencies pins an exact version, and 7.0.11 was never built for msvc 192 -- only 7.0.12 exists on aquaveo-vs2019. Left at 7.0.11 the VS2019 build of xmsgrid fails at graph resolution before compiling anything. 7.0.12 is published on both remotes at the same recipe revision, so this bump is inert for the msvc 194 / gcc / clang builds: it is the same source as 7.0.11, whose only commit was a CI regeneration. **xmsconan 2.16.0 -> 2.18.0.** CI has to generate the recipe with the same xmsconan the manual VS2019 track uses. XmsConan2File.export() copies xms_conan2_file.py into the export folder, so its contents feed the recipe revision hash, and 2.18.0 changes that file by 192 lines (the msvc 192 fork: _is_vs2019, vs2019_requirements, vs2019_dependency_overrides). Generating with 2.16.0 in CI and 2.18.0 locally would publish different rrevs for the same version, leaving aquaveo-stable and aquaveo-vs2019 out of step on what reads as one release. Nothing else in the generated output moves. build.toml declares no [vs2019_dependency_overrides] table, so the generated conanfile.py gains no new attribute. On any toolchain that is not msvc 192 the dependency graph is unchanged: 2.18.0 refactored the inline self.requires("boost/1.86.0") / self.requires("zlib/1.3.1") calls into an iteration over default_requirements holding those same references in the same order. The pins also stop being pins. 2.17.0 floated generated CI onto >= with --upgrade, so this should be the last regeneration commit this repo needs. The flake job picks up --upgrade here, which it lacked under the == pin. Co-Authored-By: Claude Opus 5 (1M context) --- .github/workflows/XmsGrid-CI.yaml | 8 ++++---- build.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/XmsGrid-CI.yaml b/.github/workflows/XmsGrid-CI.yaml index 3e959376..4c9b0f40 100644 --- a/.github/workflows/XmsGrid-CI.yaml +++ b/.github/workflows/XmsGrid-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.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + pip install --upgrade "xmsconan>=2.18.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.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + python -m pip install --upgrade "xmsconan>=2.18.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.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + pip install --upgrade "xmsconan>=2.18.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.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + python -m pip install --upgrade "xmsconan>=2.18.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 51e0b7f6..30e6bc2b 100644 --- a/build.toml +++ b/build.toml @@ -14,7 +14,7 @@ if (NOT MSVC) endif() """ -xms_dependencies = [{ name = "xmscore", version = "7.0.11" }] +xms_dependencies = [{ name = "xmscore", version = "7.0.12" }] python_namespaced_dir = "grid"