From d9227cff7edde9560134ec5a35ef3b79dfb8e267 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Fri, 20 Dec 2024 17:51:17 +0000 Subject: [PATCH 1/4] version bump --- .github/workflows/build-nuget-package.yml | 2 +- .github/workflows/test-nuget-macos.yml | 4 ++-- .github/workflows/test-nuget-package.yml | 12 ++++++------ .github/workflows/test-nuget-ubuntu.yml | 4 ++-- .github/workflows/test-nuget-win.yml | 4 ++-- MODULE.bazel | 2 +- README.md | 2 +- Version.txt | 4 ++-- docs/src/interfaces/csharp.md | 2 +- meson.build | 2 +- nuget/README.md | 2 +- pyproject.toml | 2 +- tests/test_highspy.py | 6 +++--- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml index 8e87ea2b2f..226273b932 100644 --- 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/test-nuget-macos.yml b/.github/workflows/test-nuget-macos.yml index 20b102d015..ba72778fb5 100644 --- 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 index 69559912ce..5363584d9d 100644 --- 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 index 67b60c11c9..206dad6095 100644 --- 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 index 8d6e74ef38..ad7d6a0476 100644 --- 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/MODULE.bazel b/MODULE.bazel index 1581ed2828..4697762158 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -2,7 +2,7 @@ """ module( name = "highs", - version = "1.8.1", + version = "1.9.0", ) bazel_dep( diff --git a/README.md b/README.md index 62cfef67b4..9e4d6fbd1e 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,7 @@ The nuget package Highs.Native is on https://www.nuget.org, at https://www.nuget It can be added to your C# project with `dotnet` ```shell -dotnet add package Highs.Native --version 1.8.1 +dotnet add package Highs.Native --version 1.9.0 ``` The nuget package contains runtime libraries for diff --git a/Version.txt b/Version.txt index d8e7ce799d..6282aad654 100644 --- a/Version.txt +++ b/Version.txt @@ -1,4 +1,4 @@ HIGHS_MAJOR=1 -HIGHS_MINOR=8 -HIGHS_PATCH=1 +HIGHS_MINOR=9 +HIGHS_PATCH=0 #PRE_RELEASE=YES diff --git a/docs/src/interfaces/csharp.md b/docs/src/interfaces/csharp.md index e9b24f1946..bfc2251f65 100644 --- a/docs/src/interfaces/csharp.md +++ b/docs/src/interfaces/csharp.md @@ -17,7 +17,7 @@ The nuget package Highs.Native is on https://www.nuget.org, at https://www.nuget It can be added to your C# project with `dotnet` ```shell -dotnet add package Highs.Native --version 1.8.1 +dotnet add package Highs.Native --version 1.9.0 ``` The nuget package contains runtime libraries for diff --git a/meson.build b/meson.build index de7119ea66..62a3825f55 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('highs', 'cpp', 'c', - version : '1.8.1', + version : '1.9.0', meson_version: '>= 1.1.0', default_options : ['warning_level=1', 'cpp_std=c++17', diff --git a/nuget/README.md b/nuget/README.md index 68d2034802..177ed07cda 100644 --- a/nuget/README.md +++ b/nuget/README.md @@ -7,7 +7,7 @@ The nuget package Highs.Native is on https://www.nuget.org, at https://www.nuget It can be added to your C# project with `dotnet` ```shell -dotnet add package Highs.Native --version 1.8.1 +dotnet add package Highs.Native --version 1.9.0 ``` The nuget package contains runtime libraries for diff --git a/pyproject.toml b/pyproject.toml index 0d45e2c031..1f625d2bad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "scikit_build_core.build" [project] name = "highspy" -version = "1.8.1" +version = "1.9.0" description = "A thin set of pybind11 wrappers to HiGHS" authors = [{ name = "HiGHS developers", email = "highsopt@gmail.com" }] readme = "README.md" diff --git a/tests/test_highspy.py b/tests/test_highspy.py index aaa731d983..a979d44d5a 100644 --- a/tests/test_highspy.py +++ b/tests/test_highspy.py @@ -112,10 +112,10 @@ def get_infeasible_model(self): def test_version(self): h = self.get_basic_model() - self.assertEqual(h.version(), "1.8.1") + self.assertEqual(h.version(), "1.9.0") self.assertEqual(h.versionMajor(), 1) - self.assertEqual(h.versionMinor(), 8) - self.assertEqual(h.versionPatch(), 1) + self.assertEqual(h.versionMinor(), 9) + self.assertEqual(h.versionPatch(), 0) def test_basics(self): h = self.get_basic_model() From fa40bdfd3ce39d31789dc92bc38d318008a8d857 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Fri, 20 Dec 2024 18:10:45 +0000 Subject: [PATCH 2/4] testPypi --- .github/workflows/build-wheels-push.yml | 66 ++++++++++++------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml index 751eb1c83f..549bae6830 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,34 +81,34 @@ 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_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: name: >- From 2117f1944e3ff4f04256eff91a9a1b18c6760dfc Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Fri, 20 Dec 2024 21:57:58 +0000 Subject: [PATCH 3/4] highspy already on pypi, disable push wheel workflow until the next release. --- .github/workflows/build-wheels-push.yml | 43 +++++++++++++------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml index 549bae6830..899d865c9a 100644 --- a/.github/workflows/build-wheels-push.yml +++ b/.github/workflows/build-wheels-push.yml @@ -1,6 +1,7 @@ name: build-wheels-push -on: push +on: [] +# on: push # on: # release: @@ -110,28 +111,28 @@ jobs: 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_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') + # # 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 + # environment: + # name: pypi + # url: https://pypi.org/p/highspy - permissions: - id-token: write # IMPORTANT: mandatory for trusted publishing + # permissions: + # id-token: write # IMPORTANT: mandatory for trusted publishing - steps: - - uses: actions/download-artifact@v4 - with: - pattern: cibw-* - path: dist - merge-multiple: true + # 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 + # - name: Download all + # uses: pypa/gh-action-pypi-publish@release/v1 From f41a161738f5a95ca5a9647cae85b5d9680a03db Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Fri, 20 Dec 2024 22:02:37 +0000 Subject: [PATCH 4/4] add sdist to Features.md for release tag --- FEATURES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FEATURES.md b/FEATURES.md index 76f4c4997d..40d6292050 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -1,5 +1,7 @@ ## Build changes +Python: Source Distribution update, added to PyPI + ## Code changes HiGHS now handles multiple linear objectives by either blending using weights, or performing lexicographic optimization: see https://ergo-code.github.io/HiGHS/stable/guide/further/#guide-multi-objective-optimization