Merge pull request #2568 from ERGO-Code/master-fix-ci-and-pyproject

Master fix ci and pyproject

Author: galabovaa

.github/workflows/build-wheels-push.yml

@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21
+        uses: pypa/cibuildwheel@v3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
 

.github/workflows/build-wheels.yml

@@ -47,6 +47,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21
+        uses: pypa/cibuildwheel@v3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

.github/workflows/build-windows.yml

@@ -381,36 +381,38 @@ jobs:
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
         run: ctest  --output-on-failure -C Debug
 
-  windows_debug64_fb_off:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Build Environment
-        # Some projects don't allow in-source building, so create a separate build directory
-        # We'll use this as our working directory for all subsequent commands
-        run: cmake -E make_directory ${{runner.workspace}}/build
-
-      - name: Configure CMake
-        # Use a bash shell so we can use the same syntax for environment variable
-        # access regardless of the host operating system
-        shell: bash
-        working-directory: ${{runner.workspace}}/build
-        # Note the current convention is to use the -S and -B options here to specify source
-        # and build directories, but this is only available with CMake 3.13 and higher.
-        # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=OFF -DHIGHSINT64=on -DHIGHS_NO_DEFAULT_THREADS=ON
-
-      - name: Build
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: cmake --build . --config Debug --parallel
-
-      - name: Test
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        # Execute tests defined by the CMake configuration.
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ctest  --output-on-failure -C Debug
+  # Switch off, fortran compiler lookup taking hours on new windows runner. 
+  # For fortran is best to use FAST_BUILD ON anyway.
+  # windows_debug64_fb_off:
+  #   runs-on: windows-latest
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Create Build Environment
+  #       # Some projects don't allow in-source building, so create a separate build directory
+  #       # We'll use this as our working directory for all subsequent commands
+  #       run: cmake -E make_directory ${{runner.workspace}}/build
+
+  #     - name: Configure CMake
+  #       # Use a bash shell so we can use the same syntax for environment variable
+  #       # access regardless of the host operating system
+  #       shell: bash
+  #       working-directory: ${{runner.workspace}}/build
+  #       # Note the current convention is to use the -S and -B options here to specify source
+  #       # and build directories, but this is only available with CMake 3.13 and higher.
+  #       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+  #       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=OFF -DHIGHSINT64=on -DHIGHS_NO_DEFAULT_THREADS=ON
+
+  #     - name: Build
+  #       working-directory: ${{runner.workspace}}/build
+  #       shell: bash
+  #       # Execute the build.  You can specify a specific target with "--target <NAME>"
+  #       run: cmake --build . --config Debug --parallel
+
+  #     - name: Test
+  #       working-directory: ${{runner.workspace}}/build
+  #       shell: bash
+  #       # Execute tests defined by the CMake configuration.
+  #       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+  #       run: ctest  --output-on-failure -C Debug

check/CMakeLists.txt

@@ -258,7 +258,7 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
       "lseu\;1120|1119.9999999\;"
       "egout\;(568.1007|568.1006999)\;"
       "gt2\;21166\;"
-      "rgn\;82.1999992\;"
+      "rgn\;82.19999\;"
       "bell5\;(8966406.49152|8966406.491519|8966406.49151)\;"
       "sp150x300d\;(69|68.9999999)\;"
       "p0548\;(8691|8690.9999999)\;"

pyproject.toml

@@ -202,12 +202,11 @@ testpaths = ["tests"]
 
 [tool.cibuildwheel]
 build = "*"
-skip = "cp3{6,7}-*"
+archs = ["auto64", "auto32"]
 
 # Enable free-threaded support
-free-threaded-support = true
+enable = ["cpython-freethreading"]
 
 test-command = "pytest {project}/tests"
 test-extras = ["test", "numpy"]
-test-skip = ["*universal2:arm64"]
 build-verbosity = 1