From 3aee2847a8b269fb6d6f38068d2e3c20f76e8d99 Mon Sep 17 00:00:00 2001
From: Alexander Condello <arcondello@gmail.com>
Date: Thu, 9 Apr 2026 10:07:36 -0700
Subject: [PATCH 1/2] Build with C++23

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 690d71652..a90646f83 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project(
     'dwave-optimization',
     'c', 'cpp', 'cython',
     default_options: [
-        'cpp_std=c++20',
+        'cpp_std=c++23',
         'buildtype=release',
         'b_ndebug=if-release',  # add -DNDEBUG when building for "release", which we do by default
         'optimization=3',

From 1bc5b4ea7a05d1d8ec5fcdd3b49be84b684dd9b2 Mon Sep 17 00:00:00 2001
From: Alexander Condello <arcondello@gmail.com>
Date: Thu, 9 Apr 2026 10:17:37 -0700
Subject: [PATCH 2/2] Use Windows Server 2025 in CircleCI

---
 .circleci/config.yml | 119 ++++++++++++++++++++++---------------------
 1 file changed, 62 insertions(+), 57 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 006d08992..18ede5057 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -115,7 +115,7 @@ jobs:
 
   python-windows:
     executor:
-      name: win/default
+      name: win/server-2025
 
     environment:
       <<: *global-environment
@@ -123,7 +123,12 @@ jobs:
 
     steps:
       - checkout
-      - run-cibuildwheel
+      - run:
+          name: Install Visual Studio 2026
+          shell: powershell.exe
+          command: |
+            curl.exe -L -o vs_BuildTools.exe "https://aka.ms/vs/18/release/vs_BuildTools.exe"
+      # - run-cibuildwheel
 
   python-sdist:
     docker:
@@ -357,58 +362,58 @@ jobs:
 workflows:
   tests:
     jobs:
-      - python-linux:
-          filters: &tags
-            # also run on tags so the deploy pipeline works
-            tags:
-              only: &version-string /^[0-9]+(\.[0-9]+)*((\.dev|rc)([0-9]+)?)?$/
-      - python-linux-aarch64:
-          filters: *tags
-      - python-linux-debug
-      - python-macOS:
-          matrix:
-            parameters:
-              cibw-arch: [x86_64, arm64]
-          filters: *tags
-      - python-windows:
-          filters: *tags
-      - python-sdist:
-          filters: *tags
-      - python-dependencies:
-          name: python-dependencies-oldest
-          python-version: "3.10"
-          dependency-versions: numpy==1.21.3
-          optional-dependency-versions: dimod==0.12.0 scikit-learn==1.6.0
-          requires:
-            - python-linux
-      - python-dependencies:
-          name: python-dependencies-latest
-          python-version: "3.14"
-          dependency-versions: numpy
-          optional-dependency-versions: dimod scikit-learn
-          requires:
-            - python-linux
-      - cpp-gcc:
-          name: cpp-gcc-<< matrix.gcc-version >>
-          matrix:
-            parameters:
-              gcc-version: ["12", "latest"]
-      - cpp-macOS
-      - serialization:
-          requires:
-            - python-linux
-      - docs:
-          requires:
-            - python-linux
-      - deploy:
-          filters:
-            tags:
-              only: *version-string
-            branches:
-              ignore: /.*/
-          requires:
-            - python-linux
-            - python-linux-aarch64
-            - python-macOS
-            - python-windows
-            - python-sdist
+      # - python-linux:
+      #     filters: &tags
+      #       # also run on tags so the deploy pipeline works
+      #       tags:
+      #         only: &version-string /^[0-9]+(\.[0-9]+)*((\.dev|rc)([0-9]+)?)?$/
+      # - python-linux-aarch64:
+      #     filters: *tags
+      # - python-linux-debug
+      # - python-macOS:
+      #     matrix:
+      #       parameters:
+      #         cibw-arch: [x86_64, arm64]
+      #     filters: *tags
+      - python-windows
+          # filters: *tags
+      # - python-sdist:
+      #     filters: *tags
+      # - python-dependencies:
+      #     name: python-dependencies-oldest
+      #     python-version: "3.10"
+      #     dependency-versions: numpy==1.21.3
+      #     optional-dependency-versions: dimod==0.12.0 scikit-learn==1.6.0
+      #     requires:
+      #       - python-linux
+      # - python-dependencies:
+      #     name: python-dependencies-latest
+      #     python-version: "3.14"
+      #     dependency-versions: numpy
+      #     optional-dependency-versions: dimod scikit-learn
+      #     requires:
+      #       - python-linux
+      # - cpp-gcc:
+      #     name: cpp-gcc-<< matrix.gcc-version >>
+      #     matrix:
+      #       parameters:
+      #         gcc-version: ["12", "latest"]
+      # - cpp-macOS
+      # - serialization:
+      #     requires:
+      #       - python-linux
+      # - docs:
+      #     requires:
+      #       - python-linux
+      # - deploy:
+      #     filters:
+      #       tags:
+      #         only: *version-string
+      #       branches:
+      #         ignore: /.*/
+      #     requires:
+      #       - python-linux
+      #       - python-linux-aarch64
+      #       - python-macOS
+      #       - python-windows
+      #       - python-sdist