Merge pull request #2091 from ERGO-Code/latest

Ready for release 1.9.0
ERGO-Code · Dec 21, 2024 · 66f735e · 66f735e
2 parents 4a7f24a + 7db0525
commit 66f735e
Show file tree

Hide file tree

Showing 75 changed files with 2,229 additions and 850 deletions.
diff --git a/.github/workflows/build-bazel.yml b/.github/workflows/build-bazel.yml
@@ -12,20 +12,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: bazelbuild/setup-bazelisk@v2
-
-      - name: Mount bazel cache # Optional
-        uses: actions/cache@v3
-        with:
-          path: "~/.cache/bazel"
-          key: bazel
+      - uses: bazelbuild/setup-bazelisk@v3
 
       - name: bazel clean
         run: bazel clean
 
       - name: build bazel
-        run: |
-          bazel build //...
+        run: bazel build --enable_bzlmod //...
 
-      - name: test
+      - name: test all
+        run: bazel test --enable_bzlmod //...
+
+      - name: test example
         run: ./bazel-bin/call-highs-example
diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml
@@ -185,7 +185,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - uses: actions/upload-artifact@v4
         with:

diff --git 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: |
@@ -194,7 +195,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-python-sdist.yml b/.github/workflows/build-python-sdist.yml
@@ -0,0 +1,88 @@
+name: build-python-sdist
+
+on: [push, pull_request]
+
+jobs:
+  build_sdist_ubuntu:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-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 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_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 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
+         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: |
+          $item = Get-ChildItem dist
+          python -m pip install "$item"
+
+      - 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
diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml
@@ -1,11 +1,12 @@
 name: build-wheels-push
 
+on: []
 # on: push
 
-on:
- release:
-   types:
-     - published
+# on:
+#  release:
+#    types:
+#      - published
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,13 +23,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,49 +82,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]
-
-  #   # 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:
+  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:
@@ -133,3 +107,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
diff --git 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] }}

diff --git a/.github/workflows/test-nuget-macos.yml b/.github/workflows/test-nuget-macos.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -80,7 +80,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets

diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -81,7 +81,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -124,7 +124,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -167,7 +167,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -212,7 +212,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source -n name ${{runner.workspace}}\nugets 
@@ -228,5 +228,5 @@ jobs:
           dotnet new console
           rm Program.cs 
           cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs . 
-          dotnet add package Highs.Native -v 1.8.1 -s ${{runner.workspace}}\nugets 
+          dotnet add package Highs.Native -v 1.9.0 -s ${{runner.workspace}}\nugets 
           dotnet run
diff --git a/.github/workflows/test-nuget-ubuntu.yml b/.github/workflows/test-nuget-ubuntu.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -74,7 +74,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source ${{runner.workspace}}/nugets

diff --git a/.github/workflows/test-nuget-win.yml b/.github/workflows/test-nuget-win.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.1
+        run: dotnet pack -c Release /p:Version=1.9.0
 
       - name: Add local feed 
         run: dotnet nuget add source -n name ${{runner.workspace}}\nugets 
@@ -49,5 +49,5 @@ jobs:
           dotnet new console
           rm Program.cs 
           cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs . 
-          dotnet add package Highs.Native -v 1.8.1 -s ${{runner.workspace}}\nugets 
+          dotnet add package Highs.Native -v 1.9.0 -s ${{runner.workspace}}\nugets 
           dotnet run
diff --git 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",