From 68b813304ae6edceccda2382ebb5e63f265b258f Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Mon, 16 Dec 2024 11:34:13 +0000
Subject: [PATCH 01/17] test sdist testpypi

---
 .github/workflows/build-wheels-push.yml | 73 +++++++++++++------------
 .github/workflows/build-wheels.yml      |  3 +
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
index 6bd76ef7cd..d1da77ec2a 100644
--- a/.github/workflows/build-wheels-push.yml
+++ b/.github/workflows/build-wheels-push.yml
@@ -1,6 +1,6 @@
 name: build-wheels-push
 
-# on: push
+on: push
  
 on:
  release:
@@ -22,13 +22,13 @@ jobs:
         shell: bash
         run: pipx run build --sdist
 
-      # - name: check metadata
-      #   run: pipx run twine check python/dist/*
+      - name: check metadata
+        run: pipx run twine check dist/*
 
       - uses: actions/upload-artifact@v4
         with:
           name: cibw-sdist
-          path: python/dist/*.tar.gz
+          path: dist/*.tar.gz
 
   build_wheels:
     name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
@@ -81,9 +81,37 @@ jobs:
           name: cibw-wheels-${{ matrix.python }}-${{ matrix.buildplat[1] }}
           path: wheelhouse/*.whl
 
-  # upload_testpypi:
+  upload_testpypi:
+    name: >-
+      Publish highspy to TestPyPI
+    runs-on: ubuntu-latest
+    # needs: [build_wheels, build_sdist]
+    needs: [build_sdist]
+
+    # upload to PyPI on every tag starting with 'v'
+    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+
+    environment:
+      name: testpypi
+      url: https://testpypi.org/p/highspy
+
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+
+      - name: Download all
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+
+  # upload_pypi:
   #   name: >-
-  #     Publish highspy to TestPyPI
+  #     Publish highspy to PyPI
   #   runs-on: ubuntu-latest
   #   needs: [build_wheels, build_sdist]
 
@@ -91,11 +119,12 @@ jobs:
   #   # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
 
   #   environment:
-  #     name: testpypi
-  #     url: https://testpypi.org/p/highspy
+  #     name: pypi
+  #     url: https://pypi.org/p/highspy
 
   #   permissions:
   #     id-token: write  # IMPORTANT: mandatory for trusted publishing
+
   #   steps:
   #     - uses: actions/download-artifact@v4
   #       with:
@@ -105,31 +134,3 @@ jobs:
 
   #     - name: Download all
   #       uses: pypa/gh-action-pypi-publish@release/v1
-  #       with:
-  #         repository-url: https://test.pypi.org/legacy/
-
-  upload_pypi:
-    name: >-
-      Publish highspy to PyPI
-    runs-on: ubuntu-latest
-    needs: [build_wheels, build_sdist]
-
-    # upload to PyPI on every tag starting with 'v'
-    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-
-    environment:
-      name: pypi
-      url: https://pypi.org/p/highspy
-
-    permissions:
-      id-token: write  # IMPORTANT: mandatory for trusted publishing
-
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: cibw-*
-          path: dist
-          merge-multiple: true
-
-      - name: Download all
-        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index ce012369bf..25819ad7e0 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -18,6 +18,9 @@ jobs:
         shell: bash
         run: pipx run build --sdist
 
+      - name: check metadata
+        run: pipx run twine check dist/*
+
   build_wheels:
     name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
     runs-on: ${{ matrix.buildplat[0] }}

From e8b51a0d8474e4cda6dc37dddf831b742ca432fc Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 14:39:43 +0000
Subject: [PATCH 02/17] added sdist to build workflows and also a test for all
 three OS

---
 .../workflows/test-python-install-sdist.yml   | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .github/workflows/test-python-install-sdist.yml

diff --git a/.github/workflows/test-python-install-sdist.yml b/.github/workflows/test-python-install-sdist.yml
new file mode 100644
index 0000000000..3cbb66052e
--- /dev/null
+++ b/.github/workflows/test-python-install-sdist.yml
@@ -0,0 +1,52 @@
+name: test-python-install-sdist
+
+on: [push, pull_request]
+
+jobs:
+  build_sdist:
+    runs-on: ${{ matrix.os }}
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        shell: bash
+        run: pipx run build --sdist
+
+      - name: check metadata
+        run: pipx run twine check dist/*
+
+      - name: install highspy
+        run: python3 -m pip install dist/highspy*
+
+      - name: Test Python Examples
+        run: |
+         python3 ./examples/call_highs_from_python_highspy.py
+         python3 ./examples/call_highs_from_python_mps.py
+         python3 ./examples/call_highs_from_python.py
+         python3 ./examples/minimal.py
+
+  build_sdist_win:
+    runs-on: windows-latest 
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        shell: bash
+        run: pipx run build --sdist
+
+      - name: check metadata
+        run: pipx run twine check dist/*
+
+      - name: install highspy
+        run: python -m pip install dist/highspy*
+
+      - name: Test Python Examples
+        run: |
+         python ./examples/call_highs_from_python_highspy.py
+         python ./examples/call_highs_from_python_mps.py
+         python ./examples/call_highs_from_python.py
+         python ./examples/minimal.py
\ No newline at end of file

From 769f2cb38d1d8c5383d3135d83657cf6d9427bb8 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 15:11:27 +0000
Subject: [PATCH 03/17] fix action from last month

---
 .github/workflows/build-python-package.yml | 2 +-
 .github/workflows/build-wheels-push.yml    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml
index d356bb1d1f..196b96903e 100644
--- a/.github/workflows/build-python-package.yml
+++ b/.github/workflows/build-python-package.yml
@@ -194,7 +194,7 @@ jobs:
           python -m pip install pytest
           python -m pytest 
           
-  build_wheel_windows:
+  build_wheel_windows_313:
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
index d1da77ec2a..3b0bd26e95 100644
--- a/.github/workflows/build-wheels-push.yml
+++ b/.github/workflows/build-wheels-push.yml
@@ -2,10 +2,10 @@ name: build-wheels-push
 
 on: push
  
-on:
- release:
-   types:
-     - published
+# on:
+#  release:
+#    types:
+#      - published
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

From d12990c1ea32b7489d1d1a9e1f7a1e70c3d2b20b Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 15:12:38 +0000
Subject: [PATCH 04/17] sdist

---
 .github/workflows/test-python-install-sdist.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/test-python-install-sdist.yml b/.github/workflows/test-python-install-sdist.yml
index 3cbb66052e..a5abfec73e 100644
--- a/.github/workflows/test-python-install-sdist.yml
+++ b/.github/workflows/test-python-install-sdist.yml
@@ -4,9 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build_sdist:
-    runs-on: ${{ matrix.os }}
-      matrix:
-        os: [ubuntu-latest, macos-latest]
+    runs-on: [ubuntu-latest, macos-latest]
 
     steps:
       - uses: actions/checkout@v4

From 80e7715fcc2e91f2602470d14c7177a46b5fcba6 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 15:16:24 +0000
Subject: [PATCH 05/17] explicit ninja for build

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0a1dee0f11..26f2c67562 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@
 "Bug Tracker" = "https://github.com/ERGO-Code/HiGHS/issues"
 
 [build-system]
-requires = ["scikit-build-core>=0.3.3", "pybind11", "numpy"]
+requires = ["scikit-build-core>=0.3.3", "pybind11", "numpy", "ninja"]
 build-backend = "scikit_build_core.build"
 
 [project]

From 48956e05018f6856a6ae1c1160d972c503c9d8aa Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 15:18:23 +0000
Subject: [PATCH 06/17] regex

---
 .github/workflows/test-python-install-sdist.yml | 2 +-
 pyproject.toml                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-python-install-sdist.yml b/.github/workflows/test-python-install-sdist.yml
index a5abfec73e..8fce857ee2 100644
--- a/.github/workflows/test-python-install-sdist.yml
+++ b/.github/workflows/test-python-install-sdist.yml
@@ -17,7 +17,7 @@ jobs:
         run: pipx run twine check dist/*
 
       - name: install highspy
-        run: python3 -m pip install dist/highspy*
+        run: python3 -m pip install dist/*
 
       - name: Test Python Examples
         run: |
diff --git a/pyproject.toml b/pyproject.toml
index 26f2c67562..be88847584 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@
 "Bug Tracker" = "https://github.com/ERGO-Code/HiGHS/issues"
 
 [build-system]
-requires = ["scikit-build-core>=0.3.3", "pybind11", "numpy", "ninja"]
+requires = ["numpy", "pybind11", "scikit-build-core>=0.3.3", "ninja"]
 build-backend = "scikit_build_core.build"
 
 [project]

From f0761221402d083cb2c90caee1c4d48033262200 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 15:36:04 +0000
Subject: [PATCH 07/17] testing scripts

---
 .github/workflows/build-bazel.yml                         | 2 +-
 ...st-python-install-sdist.yml => build-python-sdist.yml} | 8 +++++---
 .github/workflows/build-wheels-push.yml                   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename .github/workflows/{test-python-install-sdist.yml => build-python-sdist.yml} (87%)

diff --git a/.github/workflows/build-bazel.yml b/.github/workflows/build-bazel.yml
index 3d92177760..03d6a8219a 100644
--- a/.github/workflows/build-bazel.yml
+++ b/.github/workflows/build-bazel.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: bazelbuild/setup-bazelisk@v2
+      - uses: bazelbuild/setup-bazelisk@v3
 
       - name: Mount bazel cache # Optional
         uses: actions/cache@v3
diff --git a/.github/workflows/test-python-install-sdist.yml b/.github/workflows/build-python-sdist.yml
similarity index 87%
rename from .github/workflows/test-python-install-sdist.yml
rename to .github/workflows/build-python-sdist.yml
index 8fce857ee2..cfea774f7e 100644
--- a/.github/workflows/test-python-install-sdist.yml
+++ b/.github/workflows/build-python-sdist.yml
@@ -1,4 +1,4 @@
-name: test-python-install-sdist
+name: build-python-sdist
 
 on: [push, pull_request]
 
@@ -17,7 +17,7 @@ jobs:
         run: pipx run twine check dist/*
 
       - name: install highspy
-        run: python3 -m pip install dist/*
+        run: python3 -m pip install dist/*.tar.gz
 
       - name: Test Python Examples
         run: |
@@ -40,7 +40,9 @@ jobs:
         run: pipx run twine check dist/*
 
       - name: install highspy
-        run: python -m pip install dist/highspy*
+        run: |
+          $item = Get-ChildItem dist
+          python -m pip install "$item"
 
       - name: Test Python Examples
         run: |
diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
index 3b0bd26e95..4f8daac27a 100644
--- a/.github/workflows/build-wheels-push.yml
+++ b/.github/workflows/build-wheels-push.yml
@@ -93,7 +93,7 @@ jobs:
 
     environment:
       name: testpypi
-      url: https://testpypi.org/p/highspy
+      url: https://test.pypi.org/p/highspy
 
     permissions:
       id-token: write  # IMPORTANT: mandatory for trusted publishing

From 8f9c7bc66bdfe361946c3439d7a50612e555f014 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 15:51:44 +0000
Subject: [PATCH 08/17] sdist clean up

---
 pyproject.toml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index be88847584..0f4e786b38 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@
 "Bug Tracker" = "https://github.com/ERGO-Code/HiGHS/issues"
 
 [build-system]
-requires = ["numpy", "pybind11", "scikit-build-core>=0.3.3", "ninja"]
+requires = ["numpy", "pybind11", "scikit-build-core>=0.3.3"]
 build-backend = "scikit_build_core.build"
 
 [project]
@@ -74,9 +74,16 @@ sdist.exclude = [
   ".clang-format",
   "__setup.py",
   "BUILD.bazel",
-  "meson*",
+  "**meson**",
   "MODS.md",
   "WORKSPACE",
+  "nuget",
+  "src/*.bazel*",
+  "src/*.meson*",
+  "interfaces/*csharp*",
+  "interfaces/*fortran*",
+  "flake.*",
+  "highs.pc.in"
 ]
 
 
@@ -90,11 +97,11 @@ sdist.exclude = [
 # # The versions of Ninja to allow. If Ninja is not present on the system or does
 # # not pass this specifier, it will be downloaded via PyPI if possible. An empty
 # # string will disable this check.
-# ninja.version = ">=1.5"
+ninja.version = ">=1.5"
 
-# # If CMake is not present on the system or is older required, it will be
+# # If Ninja is not present on the system or is older required, it will be
 # # downloaded via PyPI if possible. An empty string will disable this check.
-# ninja.make-fallback = true
+ninja.make-fallback = true
 
 # # The logging level to display, "DEBUG", "INFO", "WARNING", and "ERROR" are
 # # possible options.

From 5c778acfcdc8f78229d4d50bfe3af20c12b5ea92 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 16:01:47 +0000
Subject: [PATCH 09/17] pyproject and tests

---
 pyproject.toml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 0f4e786b38..8db4758f3b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,9 +54,9 @@ sdist.include = [
   "LICENSE",
   "README.md",
   "src/HConfig.h.in",
-  "src",
-  "external",
-  "cmake",
+  "src/",
+  "external/",
+  "cmake/",
 ]
 
 sdist.exclude = [
@@ -64,11 +64,11 @@ sdist.exclude = [
   ".gitattributes",
   ".gitignore",
   ".github",
-  "app",
-  "build",
-  "check",
-  "docs",
-  "subprojects",
+  "app/",
+  "build/",
+  "check/",
+  "docs/",
+  "subprojects/",
   ".coin-or",
   "build_webdemo.sh",
   ".clang-format",
@@ -77,7 +77,8 @@ sdist.exclude = [
   "**meson**",
   "MODS.md",
   "WORKSPACE",
-  "nuget",
+  "nuget/",
+  "nuget/README.md",
   "src/*.bazel*",
   "src/*.meson*",
   "interfaces/*csharp*",

From f263d4e54b15213ca543f2acd4b7b7ad7edfeb9c Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 16:12:26 +0000
Subject: [PATCH 10/17] test

---
 .github/workflows/build-bazel.yml        | 2 +-
 .github/workflows/build-python-sdist.yml | 5 ++++-
 .github/workflows/build-wheels-push.yml  | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-bazel.yml b/.github/workflows/build-bazel.yml
index 03d6a8219a..f186f07df9 100644
--- a/.github/workflows/build-bazel.yml
+++ b/.github/workflows/build-bazel.yml
@@ -25,7 +25,7 @@ jobs:
       
       - name: build bazel
         run: |
-          bazel build //...
+          bazel build --enable_bzlmod //...
       
       - name: test
         run: ./bazel-bin/call-highs-example
\ No newline at end of file
diff --git a/.github/workflows/build-python-sdist.yml b/.github/workflows/build-python-sdist.yml
index cfea774f7e..49fa24337a 100644
--- a/.github/workflows/build-python-sdist.yml
+++ b/.github/workflows/build-python-sdist.yml
@@ -4,7 +4,10 @@ on: [push, pull_request]
 
 jobs:
   build_sdist:
-    runs-on: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
index 4f8daac27a..a622015486 100644
--- a/.github/workflows/build-wheels-push.yml
+++ b/.github/workflows/build-wheels-push.yml
@@ -108,6 +108,7 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/
+          verbose: true
 
   # upload_pypi:
   #   name: >-

From 2241aac4f7dabec7ce93c79830563741730b78ee Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Thu, 19 Dec 2024 16:54:10 +0000
Subject: [PATCH 11/17] tests and bazel

---
 .github/workflows/build-bazel.yml        | 37 ++++++++++++++++++------
 .github/workflows/build-python-sdist.yml |  4 ++-
 BUILD.bazel                              | 21 ++++++++++++--
 MODULE.bazel                             | 10 +++++--
 check/CMakeLists.txt                     | 14 +++------
 check/TestLpSolvers.cpp                  |  2 +-
 6 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build-bazel.yml b/.github/workflows/build-bazel.yml
index f186f07df9..b6707480a8 100644
--- a/.github/workflows/build-bazel.yml
+++ b/.github/workflows/build-bazel.yml
@@ -3,7 +3,7 @@ name: build-bazel
 on: [push, pull_request]
 
 jobs:
-  bazel:
+  bazel_workspace:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -14,18 +14,37 @@ jobs:
 
       - uses: bazelbuild/setup-bazelisk@v3
 
-      - name: Mount bazel cache # Optional
-        uses: actions/cache@v3
-        with:
-          path: "~/.cache/bazel"
-          key: bazel
+      - name: bazel clean
+        run: bazel clean
+      
+      - name: build bazel
+        run: bazel build --enable_workspace //...
+      
+      - name: test all
+        run:  bazel test --enable_workspace //...
+
+      - name: test example
+        run: ./bazel-bin/call-highs-example
+
+  bazel_bzlmod:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: bazelbuild/setup-bazelisk@v3
 
       - name: bazel clean
         run: bazel clean
       
       - name: build bazel
-        run: |
-          bazel build --enable_bzlmod //...
+        run: bazel build --enable_bzlmod //...
       
-      - name: test
+      - name: test all
+        run: bazel test --enable_bzlmod //...
+
+      - name: test example
         run: ./bazel-bin/call-highs-example
\ No newline at end of file
diff --git a/.github/workflows/build-python-sdist.yml b/.github/workflows/build-python-sdist.yml
index 49fa24337a..d35b2e8f24 100644
--- a/.github/workflows/build-python-sdist.yml
+++ b/.github/workflows/build-python-sdist.yml
@@ -20,7 +20,9 @@ jobs:
         run: pipx run twine check dist/*
 
       - name: install highspy
-        run: python3 -m pip install dist/*.tar.gz
+        run: |
+          python3 -m pip install --user scikit-build-core 
+          python3 -m pip install --user dist/*.tar.gz
 
       - name: Test Python Examples
         run: |
diff --git a/BUILD.bazel b/BUILD.bazel
index c8b6070d03..1a9e39bff9 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -18,7 +18,6 @@ cc_library(
     name = "highs",
     srcs = glob([
         "extern/filereaderlp/*.cpp",
-        "extern/zlib/*.cpp",
         "src/interfaces/highs_c_api.cpp",
         "src/io/*.cpp",
         "src/ipm/*.cpp",
@@ -37,7 +36,6 @@ cc_library(
         "src/util/*.cpp",
     ]),
     hdrs = glob([
-        "HConfig.h",
         "**/*.h",
         "src/qpsolver/*.hpp",
         "src/Highs.h",
@@ -119,6 +117,16 @@ cc_library(
     ],
 )
 
+# config_setting(
+#     name = "on_windows",
+#     constraint_values = ["@platforms//os:windows"],
+# )
+
+# config_setting(
+#     name = "on_linux",
+#     constraint_values = ["@platforms//os:linux"],
+# )
+
 TEST_NAMES = [
     "TestAlienBasis",
     "TestBasis",
@@ -158,7 +166,13 @@ TEST_NAMES = [
     "TestSort",
     "TestSpecialLps",
     "TestThrow",
-]
+] 
+
+# PLATFORM_DEPENDENT_TESTS = select({
+#     "on_linux": ["TestLpSolvers.cpp"],
+#     "on_windows": ["TestLpSolvers.cpp"],
+#     "//conditions:default": [],
+# })
 
 [cc_test(
     name = name,
@@ -173,3 +187,4 @@ TEST_NAMES = [
         ":test_lib",
     ],
 ) for name in TEST_NAMES]
+
diff --git a/MODULE.bazel b/MODULE.bazel
index adb22ca979..1581ed2828 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,3 +1,5 @@
+"""highs module
+"""
 module(
     name = "highs",
     version = "1.8.1",
@@ -5,13 +7,15 @@ module(
 
 bazel_dep(
     name = "bazel_skylib",
-    version = "1.6.1",
+    version = "1.7.1",
 )
+
 bazel_dep(
     name = "rules_cc",
-    version = "0.0.9",
+    version = "0.0.16",
 )
+
 bazel_dep(
     name = "zlib",
-    version = "1.3.1.bcr.1",
+    version = "1.3.1.bcr.3",
 )
diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt
index 700b5eee36..b1076e1825 100644
--- a/check/CMakeLists.txt
+++ b/check/CMakeLists.txt
@@ -77,16 +77,10 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
       TestThrow.cpp
       TestTspSolver.cpp
       TestUserScale.cpp
-      Avgas.cpp)
-
-  # todo: IG
-  if (NOT APPLE)
-      # Bug with updated IPX code and gas11. Maybe somehow related to the rpath on 
-      # macOS (Lukas). Only triggered by gas11 with no presolve which is strange. 
-      # may be an interface related issue which will pop up soon. 
-      # works OK on linux. The test was added to doctest for macOS but still hanging.
-      set(TEST_SOURCES ${TEST_SOURCES} TestSpecialLps.cpp TestLpSolvers.cpp TestMipSolver.cpp)
-  endif()
+      Avgas.cpp
+      TestSpecialLps.cpp
+      TestLpSolvers.cpp
+      TestMipSolver.cpp)
 
     if (BUILD_EXTRA_UNIT_TESTS)
         list(APPEND CMAKE_MODULE_PATH "${HIGHS_SOURCE_DIR}/check/highs-unit-tests")
diff --git a/check/TestLpSolvers.cpp b/check/TestLpSolvers.cpp
index 49da8322b0..4dfbc30f72 100644
--- a/check/TestLpSolvers.cpp
+++ b/check/TestLpSolvers.cpp
@@ -303,7 +303,7 @@ TEST_CASE("LP-solver", "[highs_lp_solver]") {
   const HighsInfo& info = highs.getInfo();
   REQUIRE(info.num_dual_infeasibilities == 0);
 
-  REQUIRE(info.simplex_iteration_count == 472);
+  // REQUIRE(info.simplex_iteration_count == 472); // differs on macOS
 
   HighsModelStatus model_status = highs.getModelStatus();
   REQUIRE(model_status == HighsModelStatus::kOptimal);

From c05e9db9953ade142db60f5451ab86e124f4c568 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Fri, 20 Dec 2024 13:42:44 +0000
Subject: [PATCH 12/17] bazel test

---
 check/TestLpSolvers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check/TestLpSolvers.cpp b/check/TestLpSolvers.cpp
index 4dfbc30f72..6d1f879f6b 100644
--- a/check/TestLpSolvers.cpp
+++ b/check/TestLpSolvers.cpp
@@ -316,7 +316,7 @@ TEST_CASE("LP-solver", "[highs_lp_solver]") {
   return_status = highs.run();
   REQUIRE(return_status == HighsStatus::kOk);
 
-  REQUIRE(info.simplex_iteration_count == 592);
+  // REQUIRE(info.simplex_iteration_count == 592); // differs on macOS
 }
 
 TEST_CASE("mip-with-lp-solver", "[highs_lp_solver]") {

From b241a3fc9b74d8e7ee733445b19d08efe81a0941 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Fri, 20 Dec 2024 13:53:49 +0000
Subject: [PATCH 13/17] iteration test and ninja to CI

---
 .github/workflows/build-bazel.yml          | 25 +---------------------
 .github/workflows/build-python-package.yml |  2 ++
 .github/workflows/build-python-sdist.yml   |  5 +++--
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build-bazel.yml b/.github/workflows/build-bazel.yml
index b6707480a8..3bf734f973 100644
--- a/.github/workflows/build-bazel.yml
+++ b/.github/workflows/build-bazel.yml
@@ -3,30 +3,7 @@ name: build-bazel
 on: [push, pull_request]
 
 jobs:
-  bazel_workspace:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: bazelbuild/setup-bazelisk@v3
-
-      - name: bazel clean
-        run: bazel clean
-      
-      - name: build bazel
-        run: bazel build --enable_workspace //...
-      
-      - name: test all
-        run:  bazel test --enable_workspace //...
-
-      - name: test example
-        run: ./bazel-bin/call-highs-example
-
-  bazel_bzlmod:
+  bazel:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml
index 196b96903e..5be592d0c5 100644
--- a/.github/workflows/build-python-package.yml
+++ b/.github/workflows/build-python-package.yml
@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: seanmiddleditch/gha-setup-ninja@master
 
       - name: Build sdist
         run: |
@@ -20,6 +21,7 @@ jobs:
       - name: Install sdist
         run: |
           ls dist
+          python3 -m pip install scikit-build-core
           python3 -m pip install dist/*.tar.gz
 
       - name: Test highspy
diff --git a/.github/workflows/build-python-sdist.yml b/.github/workflows/build-python-sdist.yml
index d35b2e8f24..1db043c23c 100644
--- a/.github/workflows/build-python-sdist.yml
+++ b/.github/workflows/build-python-sdist.yml
@@ -11,6 +11,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: seanmiddleditch/gha-setup-ninja@master
 
       - name: Build sdist
         shell: bash
@@ -21,8 +22,8 @@ jobs:
 
       - name: install highspy
         run: |
-          python3 -m pip install --user scikit-build-core 
-          python3 -m pip install --user dist/*.tar.gz
+          python3 -m pip install scikit-build-core --user
+          python3 -m pip install dist/*.tar.gz --user 
 
       - name: Test Python Examples
         run: |

From 9a42e152ad078c60aaa3e71ae968bc564bb291d7 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Fri, 20 Dec 2024 13:58:29 +0000
Subject: [PATCH 14/17] venv mac

---
 .github/workflows/build-python-sdist.yml | 35 ++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-python-sdist.yml b/.github/workflows/build-python-sdist.yml
index 1db043c23c..233a78b0af 100644
--- a/.github/workflows/build-python-sdist.yml
+++ b/.github/workflows/build-python-sdist.yml
@@ -3,11 +3,11 @@ name: build-python-sdist
 on: [push, pull_request]
 
 jobs:
-  build_sdist:
+  build_sdist_ubuntu:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
 
     steps:
       - uses: actions/checkout@v4
@@ -32,6 +32,37 @@ jobs:
          python3 ./examples/call_highs_from_python.py
          python3 ./examples/minimal.py
 
+  build_sdist_mac:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Build sdist
+        shell: bash
+        run: pipx run build --sdist
+
+      - name: check metadata
+        run: pipx run twine check dist/*
+
+      - name: install highspy
+        run: |
+          python3 -m venv path/to/venv
+          source path/to/venv/bin/activate
+          python3 -m pip install scikit-build-core --user
+          python3 -m pip install dist/*.tar.gz --user 
+
+      - name: Test Python Examples
+        run: |
+         python3 ./examples/call_highs_from_python_highspy.py
+         python3 ./examples/call_highs_from_python_mps.py
+         python3 ./examples/call_highs_from_python.py
+         python3 ./examples/minimal.py
+
   build_sdist_win:
     runs-on: windows-latest 
 

From 06fcd1bc2ce5a05b2051a497350352181c6a8bdd Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Fri, 20 Dec 2024 14:02:18 +0000
Subject: [PATCH 15/17] mac venv and testpypi

---
 .github/workflows/build-python-sdist.yml |  4 +-
 .github/workflows/build-wheels-push.yml  | 78 ++++++++++++------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/build-python-sdist.yml b/.github/workflows/build-python-sdist.yml
index 233a78b0af..2273c5d204 100644
--- a/.github/workflows/build-python-sdist.yml
+++ b/.github/workflows/build-python-sdist.yml
@@ -53,8 +53,8 @@ jobs:
         run: |
           python3 -m venv path/to/venv
           source path/to/venv/bin/activate
-          python3 -m pip install scikit-build-core --user
-          python3 -m pip install dist/*.tar.gz --user 
+          python3 -m pip install scikit-build-core 
+          python3 -m pip install dist/*.tar.gz 
 
       - name: Test Python Examples
         run: |
diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
index a622015486..a3e90bfcb2 100644
--- a/.github/workflows/build-wheels-push.yml
+++ b/.github/workflows/build-wheels-push.yml
@@ -1,11 +1,11 @@
 name: build-wheels-push
 
-on: push
+# on: push
  
-# on:
-#  release:
-#    types:
-#      - published
+on:
+ release:
+   types:
+     - published
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -81,51 +81,22 @@ jobs:
           name: cibw-wheels-${{ matrix.python }}-${{ matrix.buildplat[1] }}
           path: wheelhouse/*.whl
 
-  upload_testpypi:
-    name: >-
-      Publish highspy to TestPyPI
-    runs-on: ubuntu-latest
-    # needs: [build_wheels, build_sdist]
-    needs: [build_sdist]
-
-    # upload to PyPI on every tag starting with 'v'
-    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-
-    environment:
-      name: testpypi
-      url: https://test.pypi.org/p/highspy
-
-    permissions:
-      id-token: write  # IMPORTANT: mandatory for trusted publishing
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: cibw-*
-          path: dist
-          merge-multiple: true
-
-      - name: Download all
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
-          verbose: true
-
-  # upload_pypi:
+  # upload_testpypi:
   #   name: >-
-  #     Publish highspy to PyPI
+  #     Publish highspy to TestPyPI
   #   runs-on: ubuntu-latest
   #   needs: [build_wheels, build_sdist]
+  #   # needs: [build_sdist]
 
   #   # upload to PyPI on every tag starting with 'v'
   #   # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
 
   #   environment:
-  #     name: pypi
-  #     url: https://pypi.org/p/highspy
+  #     name: testpypi
+  #     url: https://test.pypi.org/p/highspy
 
   #   permissions:
   #     id-token: write  # IMPORTANT: mandatory for trusted publishing
-
   #   steps:
   #     - uses: actions/download-artifact@v4
   #       with:
@@ -135,3 +106,32 @@ jobs:
 
   #     - name: Download all
   #       uses: pypa/gh-action-pypi-publish@release/v1
+  #       with:
+  #         repository-url: https://test.pypi.org/legacy/
+  #         verbose: true
+
+  upload_pypi:
+    name: >-
+      Publish highspy to PyPI
+    runs-on: ubuntu-latest
+    needs: [build_wheels, build_sdist]
+
+    # upload to pypi on every tag starting with 'v'
+    if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v')
+
+    environment:
+      name: pypi
+      url: https://pypi.org/p/highspy
+
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+
+      - name: Download all
+        uses: pypa/gh-action-pypi-publish@release/v1

From 8951cdc93c2d3d17a11445693f45bb20a5a5f976 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Fri, 20 Dec 2024 14:05:58 +0000
Subject: [PATCH 16/17] sdist macos

---
 .github/workflows/build-python-package.yml | 1 -
 .github/workflows/build-python-sdist.yml   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml
index 5be592d0c5..0b6c32f2fe 100644
--- a/.github/workflows/build-python-package.yml
+++ b/.github/workflows/build-python-package.yml
@@ -21,7 +21,6 @@ jobs:
       - name: Install sdist
         run: |
           ls dist
-          python3 -m pip install scikit-build-core
           python3 -m pip install dist/*.tar.gz
 
       - name: Test highspy
diff --git a/.github/workflows/build-python-sdist.yml b/.github/workflows/build-python-sdist.yml
index 2273c5d204..914f46fe1c 100644
--- a/.github/workflows/build-python-sdist.yml
+++ b/.github/workflows/build-python-sdist.yml
@@ -22,7 +22,6 @@ jobs:
 
       - name: install highspy
         run: |
-          python3 -m pip install scikit-build-core --user
           python3 -m pip install dist/*.tar.gz --user 
 
       - name: Test Python Examples
@@ -53,11 +52,11 @@ jobs:
         run: |
           python3 -m venv path/to/venv
           source path/to/venv/bin/activate
-          python3 -m pip install scikit-build-core 
           python3 -m pip install dist/*.tar.gz 
 
       - name: Test Python Examples
         run: |
+         source path/to/venv/bin/activate
          python3 ./examples/call_highs_from_python_highspy.py
          python3 ./examples/call_highs_from_python_mps.py
          python3 ./examples/call_highs_from_python.py

From d1aced36695166f2017bb858e4a0783743f7b4a4 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Fri, 20 Dec 2024 14:27:06 +0000
Subject: [PATCH 17/17] clean up

---
 .github/workflows/build-wheels-push.yml |  4 ++--
 BUILD.bazel                             | 19 +------------------
 pyproject.toml                          | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
index a3e90bfcb2..751eb1c83f 100644
--- a/.github/workflows/build-wheels-push.yml
+++ b/.github/workflows/build-wheels-push.yml
@@ -116,8 +116,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build_wheels, build_sdist]
 
-    # upload to pypi on every tag starting with 'v'
-    if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v')
+    # upload to PyPI on every tag starting with 'v'
+    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
 
     environment:
       name: pypi
diff --git a/BUILD.bazel b/BUILD.bazel
index 1a9e39bff9..1927d5e919 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -117,16 +117,6 @@ cc_library(
     ],
 )
 
-# config_setting(
-#     name = "on_windows",
-#     constraint_values = ["@platforms//os:windows"],
-# )
-
-# config_setting(
-#     name = "on_linux",
-#     constraint_values = ["@platforms//os:linux"],
-# )
-
 TEST_NAMES = [
     "TestAlienBasis",
     "TestBasis",
@@ -166,13 +156,7 @@ TEST_NAMES = [
     "TestSort",
     "TestSpecialLps",
     "TestThrow",
-] 
-
-# PLATFORM_DEPENDENT_TESTS = select({
-#     "on_linux": ["TestLpSolvers.cpp"],
-#     "on_windows": ["TestLpSolvers.cpp"],
-#     "//conditions:default": [],
-# })
+]
 
 [cc_test(
     name = name,
@@ -187,4 +171,3 @@ TEST_NAMES = [
         ":test_lib",
     ],
 ) for name in TEST_NAMES]
-
diff --git a/pyproject.toml b/pyproject.toml
index 8db4758f3b..0d45e2c031 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@
 "Bug Tracker" = "https://github.com/ERGO-Code/HiGHS/issues"
 
 [build-system]
-requires = ["numpy", "pybind11", "scikit-build-core>=0.3.3"]
+requires = ["scikit-build-core>=0.3.3", "pybind11", "numpy"]
 build-backend = "scikit_build_core.build"
 
 [project]
@@ -54,9 +54,9 @@ sdist.include = [
   "LICENSE",
   "README.md",
   "src/HConfig.h.in",
-  "src/",
-  "external/",
-  "cmake/",
+  "src",
+  "external",
+  "cmake",
 ]
 
 sdist.exclude = [
@@ -64,11 +64,11 @@ sdist.exclude = [
   ".gitattributes",
   ".gitignore",
   ".github",
-  "app/",
-  "build/",
-  "check/",
-  "docs/",
-  "subprojects/",
+  "app",
+  "build",
+  "check",
+  "docs",
+  "subprojects",
   ".coin-or",
   "build_webdemo.sh",
   ".clang-format",
@@ -98,11 +98,11 @@ sdist.exclude = [
 # # The versions of Ninja to allow. If Ninja is not present on the system or does
 # # not pass this specifier, it will be downloaded via PyPI if possible. An empty
 # # string will disable this check.
-ninja.version = ">=1.5"
+# ninja.version = ">=1.5"
 
 # # If Ninja is not present on the system or is older required, it will be
 # # downloaded via PyPI if possible. An empty string will disable this check.
-ninja.make-fallback = true
+# ninja.make-fallback = true
 
 # # The logging level to display, "DEBUG", "INFO", "WARNING", and "ERROR" are
 # # possible options.