Skip to content

Commit 66f735e

Browse files
galabovaagalabovaa
authored
Merge pull request ERGO-Code#2091 from ERGO-Code/latest
Ready for release 1.9.0
2 parents 4a7f24a + 7db0525 commit 66f735e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2229
-850
lines changed

‎.github/workflows/build-bazel.yml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,16 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414

15-
- uses: bazelbuild/setup-bazelisk@v2
16-
17-
- name: Mount bazel cache # Optional
18-
uses: actions/cache@v3
19-
with:
20-
path: "~/.cache/bazel"
21-
key: bazel
15+
- uses: bazelbuild/setup-bazelisk@v3
2216

2317
- name: bazel clean
2418
run: bazel clean
2519

2620
- name: build bazel
27-
run: |
28-
bazel build //...
21+
run: bazel build --enable_bzlmod //...
2922

30-
- name: test
23+
- name: test all
24+
run: bazel test --enable_bzlmod //...
25+
26+
- name: test example
3127
run: ./bazel-bin/call-highs-example

‎.github/workflows/build-nuget-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185

186186
- name: Dotnet pack
187187
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
188-
run: dotnet pack -c Release /p:Version=1.8.1
188+
run: dotnet pack -c Release /p:Version=1.9.0
189189

190190
- uses: actions/upload-artifact@v4
191191
with:

‎.github/workflows/build-python-package.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14+
- uses: seanmiddleditch/gha-setup-ninja@master
1415

1516
- name: Build sdist
1617
run: |
@@ -194,7 +195,7 @@ jobs:
194195
python -m pip install pytest
195196
python -m pytest
196197
197-
build_wheel_windows:
198+
build_wheel_windows_313:
198199
runs-on: windows-2019
199200
steps:
200201
- uses: actions/checkout@v4

‎.github/workflows/build-python-sdist.yml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: build-python-sdist
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build_sdist_ubuntu:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
matrix:
10+
os: [ubuntu-latest]
11+
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: seanmiddleditch/gha-setup-ninja@master
15+
16+
- name: Build sdist
17+
shell: bash
18+
run: pipx run build --sdist
19+
20+
- name: check metadata
21+
run: pipx run twine check dist/*
22+
23+
- name: install highspy
24+
run: |
25+
python3 -m pip install dist/*.tar.gz --user
26+
27+
- name: Test Python Examples
28+
run: |
29+
python3 ./examples/call_highs_from_python_highspy.py
30+
python3 ./examples/call_highs_from_python_mps.py
31+
python3 ./examples/call_highs_from_python.py
32+
python3 ./examples/minimal.py
33+
34+
build_sdist_mac:
35+
runs-on: ${{ matrix.os }}
36+
strategy:
37+
matrix:
38+
os: [macos-latest]
39+
40+
steps:
41+
- uses: actions/checkout@v4
42+
- uses: seanmiddleditch/gha-setup-ninja@master
43+
44+
- name: Build sdist
45+
shell: bash
46+
run: pipx run build --sdist
47+
48+
- name: check metadata
49+
run: pipx run twine check dist/*
50+
51+
- name: install highspy
52+
run: |
53+
python3 -m venv path/to/venv
54+
source path/to/venv/bin/activate
55+
python3 -m pip install dist/*.tar.gz
56+
57+
- name: Test Python Examples
58+
run: |
59+
source path/to/venv/bin/activate
60+
python3 ./examples/call_highs_from_python_highspy.py
61+
python3 ./examples/call_highs_from_python_mps.py
62+
python3 ./examples/call_highs_from_python.py
63+
python3 ./examples/minimal.py
64+
65+
build_sdist_win:
66+
runs-on: windows-latest
67+
68+
steps:
69+
- uses: actions/checkout@v4
70+
71+
- name: Build sdist
72+
shell: bash
73+
run: pipx run build --sdist
74+
75+
- name: check metadata
76+
run: pipx run twine check dist/*
77+
78+
- name: install highspy
79+
run: |
80+
$item = Get-ChildItem dist
81+
python -m pip install "$item"
82+
83+
- name: Test Python Examples
84+
run: |
85+
python ./examples/call_highs_from_python_highspy.py
86+
python ./examples/call_highs_from_python_mps.py
87+
python ./examples/call_highs_from_python.py
88+
python ./examples/minimal.py

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

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: build-wheels-push
22

3+
on: []
34
# on: push
45

5-
on:
6-
release:
7-
types:
8-
- published
6+
# on:
7+
# release:
8+
# types:
9+
# - published
910

1011
concurrency:
1112
group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,13 +23,13 @@ jobs:
2223
shell: bash
2324
run: pipx run build --sdist
2425

25-
# - name: check metadata
26-
# run: pipx run twine check python/dist/*
26+
- name: check metadata
27+
run: pipx run twine check dist/*
2728

2829
- uses: actions/upload-artifact@v4
2930
with:
3031
name: cibw-sdist
31-
path: python/dist/*.tar.gz
32+
path: dist/*.tar.gz
3233

3334
build_wheels:
3435
name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
@@ -81,49 +82,22 @@ jobs:
8182
name: cibw-wheels-${{ matrix.python }}-${{ matrix.buildplat[1] }}
8283
path: wheelhouse/*.whl
8384

84-
# upload_testpypi:
85-
# name: >-
86-
# Publish highspy to TestPyPI
87-
# runs-on: ubuntu-latest
88-
# needs: [build_wheels, build_sdist]
89-
90-
# # upload to PyPI on every tag starting with 'v'
91-
# # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
92-
93-
# environment:
94-
# name: testpypi
95-
# url: https://testpypi.org/p/highspy
96-
97-
# permissions:
98-
# id-token: write # IMPORTANT: mandatory for trusted publishing
99-
# steps:
100-
# - uses: actions/download-artifact@v4
101-
# with:
102-
# pattern: cibw-*
103-
# path: dist
104-
# merge-multiple: true
105-
106-
# - name: Download all
107-
# uses: pypa/gh-action-pypi-publish@release/v1
108-
# with:
109-
# repository-url: https://test.pypi.org/legacy/
110-
111-
upload_pypi:
85+
upload_testpypi:
11286
name: >-
113-
Publish highspy to PyPI
87+
Publish highspy to TestPyPI
11488
runs-on: ubuntu-latest
11589
needs: [build_wheels, build_sdist]
90+
# needs: [build_sdist]
11691

11792
# upload to PyPI on every tag starting with 'v'
11893
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
11994

12095
environment:
121-
name: pypi
122-
url: https://pypi.org/p/highspy
96+
name: testpypi
97+
url: https://test.pypi.org/p/highspy
12398

12499
permissions:
125100
id-token: write # IMPORTANT: mandatory for trusted publishing
126-
127101
steps:
128102
- uses: actions/download-artifact@v4
129103
with:
@@ -133,3 +107,32 @@ jobs:
133107

134108
- name: Download all
135109
uses: pypa/gh-action-pypi-publish@release/v1
110+
with:
111+
repository-url: https://test.pypi.org/legacy/
112+
verbose: true
113+
114+
# upload_pypi:
115+
# name: >-
116+
# Publish highspy to PyPI
117+
# runs-on: ubuntu-latest
118+
# needs: [build_wheels, build_sdist]
119+
120+
# # upload to PyPI on every tag starting with 'v'
121+
# # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
122+
123+
# environment:
124+
# name: pypi
125+
# url: https://pypi.org/p/highspy
126+
127+
# permissions:
128+
# id-token: write # IMPORTANT: mandatory for trusted publishing
129+
130+
# steps:
131+
# - uses: actions/download-artifact@v4
132+
# with:
133+
# pattern: cibw-*
134+
# path: dist
135+
# merge-multiple: true
136+
137+
# - name: Download all
138+
# uses: pypa/gh-action-pypi-publish@release/v1

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
shell: bash
1919
run: pipx run build --sdist
2020

21+
- name: check metadata
22+
run: pipx run twine check dist/*
23+
2124
build_wheels:
2225
name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
2326
runs-on: ${{ matrix.buildplat[0] }}

‎.github/workflows/test-nuget-macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Dotnet pack
3737
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
38-
run: dotnet pack -c Release /p:Version=1.8.1
38+
run: dotnet pack -c Release /p:Version=1.9.0
3939

4040
- name: Add local feed
4141
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -80,7 +80,7 @@ jobs:
8080

8181
- name: Dotnet pack
8282
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
83-
run: dotnet pack -c Release /p:Version=1.8.1
83+
run: dotnet pack -c Release /p:Version=1.9.0
8484

8585
- name: Add local feed
8686
run: dotnet nuget add source ${{runner.workspace}}/nugets

‎.github/workflows/test-nuget-package.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Dotnet pack
3737
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
38-
run: dotnet pack -c Release /p:Version=1.8.1
38+
run: dotnet pack -c Release /p:Version=1.9.0
3939

4040
- name: Add local feed
4141
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: Dotnet pack
8383
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
84-
run: dotnet pack -c Release /p:Version=1.8.1
84+
run: dotnet pack -c Release /p:Version=1.9.0
8585

8686
- name: Add local feed
8787
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -124,7 +124,7 @@ jobs:
124124

125125
- name: Dotnet pack
126126
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
127-
run: dotnet pack -c Release /p:Version=1.8.1
127+
run: dotnet pack -c Release /p:Version=1.9.0
128128

129129
- name: Add local feed
130130
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -167,7 +167,7 @@ jobs:
167167

168168
- name: Dotnet pack
169169
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
170-
run: dotnet pack -c Release /p:Version=1.8.1
170+
run: dotnet pack -c Release /p:Version=1.9.0
171171

172172
- name: Add local feed
173173
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -212,7 +212,7 @@ jobs:
212212

213213
- name: Dotnet pack
214214
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
215-
run: dotnet pack -c Release /p:Version=1.8.1
215+
run: dotnet pack -c Release /p:Version=1.9.0
216216

217217
- name: Add local feed
218218
run: dotnet nuget add source -n name ${{runner.workspace}}\nugets
@@ -228,5 +228,5 @@ jobs:
228228
dotnet new console
229229
rm Program.cs
230230
cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs .
231-
dotnet add package Highs.Native -v 1.8.1 -s ${{runner.workspace}}\nugets
231+
dotnet add package Highs.Native -v 1.9.0 -s ${{runner.workspace}}\nugets
232232
dotnet run

‎.github/workflows/test-nuget-ubuntu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Dotnet pack
3333
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
34-
run: dotnet pack -c Release /p:Version=1.8.1
34+
run: dotnet pack -c Release /p:Version=1.9.0
3535

3636
- name: Add local feed
3737
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Dotnet pack
7676
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
77-
run: dotnet pack -c Release /p:Version=1.8.1
77+
run: dotnet pack -c Release /p:Version=1.9.0
7878

7979
- name: Add local feed
8080
run: dotnet nuget add source ${{runner.workspace}}/nugets

‎.github/workflows/test-nuget-win.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- name: Dotnet pack
3535
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
36-
run: dotnet pack -c Release /p:Version=1.8.1
36+
run: dotnet pack -c Release /p:Version=1.9.0
3737

3838
- name: Add local feed
3939
run: dotnet nuget add source -n name ${{runner.workspace}}\nugets
@@ -49,5 +49,5 @@ jobs:
4949
dotnet new console
5050
rm Program.cs
5151
cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs .
52-
dotnet add package Highs.Native -v 1.8.1 -s ${{runner.workspace}}\nugets
52+
dotnet add package Highs.Native -v 1.9.0 -s ${{runner.workspace}}\nugets
5353
dotnet run

0 commit comments

Comments
 (0)