Skip to content

Commit efa50c5

Browse files
galabovaagalabovaa
authored
Merge pull request ERGO-Code#2089 from ERGO-Code/sdist
Add sdist to python package and update bazel build and test
2 parents ee702d3 + d1aced3 commit efa50c5

File tree

10 files changed

+129
-35
lines changed

10 files changed

+129
-35
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-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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
shell: bash
2323
run: pipx run build --sdist
2424

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

2828
- uses: actions/upload-artifact@v4
2929
with:
3030
name: cibw-sdist
31-
path: python/dist/*.tar.gz
31+
path: dist/*.tar.gz
3232

3333
build_wheels:
3434
name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
@@ -86,13 +86,14 @@ jobs:
8686
# Publish highspy to TestPyPI
8787
# runs-on: ubuntu-latest
8888
# needs: [build_wheels, build_sdist]
89+
# # needs: [build_sdist]
8990

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

9394
# environment:
9495
# name: testpypi
95-
# url: https://testpypi.org/p/highspy
96+
# url: https://test.pypi.org/p/highspy
9697

9798
# permissions:
9899
# id-token: write # IMPORTANT: mandatory for trusted publishing
@@ -107,6 +108,7 @@ jobs:
107108
# uses: pypa/gh-action-pypi-publish@release/v1
108109
# with:
109110
# repository-url: https://test.pypi.org/legacy/
111+
# verbose: true
110112

111113
upload_pypi:
112114
name: >-

‎.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] }}

‎BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ cc_library(
1818
name = "highs",
1919
srcs = glob([
2020
"extern/filereaderlp/*.cpp",
21-
"extern/zlib/*.cpp",
2221
"src/interfaces/highs_c_api.cpp",
2322
"src/io/*.cpp",
2423
"src/ipm/*.cpp",
@@ -37,7 +36,6 @@ cc_library(
3736
"src/util/*.cpp",
3837
]),
3938
hdrs = glob([
40-
"HConfig.h",
4139
"**/*.h",
4240
"src/qpsolver/*.hpp",
4341
"src/Highs.h",

‎MODULE.bazel‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1+
"""highs module
2+
"""
13
module(
24
name = "highs",
35
version = "1.8.1",
46
)
57

68
bazel_dep(
79
name = "bazel_skylib",
8-
version = "1.6.1",
10+
version = "1.7.1",
911
)
12+
1013
bazel_dep(
1114
name = "rules_cc",
12-
version = "0.0.9",
15+
version = "0.0.16",
1316
)
17+
1418
bazel_dep(
1519
name = "zlib",
16-
version = "1.3.1.bcr.1",
20+
version = "1.3.1.bcr.3",
1721
)

‎check/CMakeLists.txt‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,10 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
7777
TestThrow.cpp
7878
TestTspSolver.cpp
7979
TestUserScale.cpp
80-
Avgas.cpp)
81-
82-
# todo: IG
83-
if (NOT APPLE)
84-
# Bug with updated IPX code and gas11. Maybe somehow related to the rpath on
85-
# macOS (Lukas). Only triggered by gas11 with no presolve which is strange.
86-
# may be an interface related issue which will pop up soon.
87-
# works OK on linux. The test was added to doctest for macOS but still hanging.
88-
set(TEST_SOURCES ${TEST_SOURCES} TestSpecialLps.cpp TestLpSolvers.cpp TestMipSolver.cpp)
89-
endif()
80+
Avgas.cpp
81+
TestSpecialLps.cpp
82+
TestLpSolvers.cpp
83+
TestMipSolver.cpp)
9084

9185
if (BUILD_EXTRA_UNIT_TESTS)
9286
list(APPEND CMAKE_MODULE_PATH "${HIGHS_SOURCE_DIR}/check/highs-unit-tests")

‎check/TestLpSolvers.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ TEST_CASE("LP-solver", "[highs_lp_solver]") {
303303
const HighsInfo& info = highs.getInfo();
304304
REQUIRE(info.num_dual_infeasibilities == 0);
305305

306-
REQUIRE(info.simplex_iteration_count == 472);
306+
// REQUIRE(info.simplex_iteration_count == 472); // differs on macOS
307307

308308
HighsModelStatus model_status = highs.getModelStatus();
309309
REQUIRE(model_status == HighsModelStatus::kOptimal);
@@ -316,7 +316,7 @@ TEST_CASE("LP-solver", "[highs_lp_solver]") {
316316
return_status = highs.run();
317317
REQUIRE(return_status == HighsStatus::kOk);
318318

319-
REQUIRE(info.simplex_iteration_count == 592);
319+
// REQUIRE(info.simplex_iteration_count == 592); // differs on macOS
320320
}
321321

322322
TEST_CASE("mip-with-lp-solver", "[highs_lp_solver]") {

‎pyproject.toml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,17 @@ sdist.exclude = [
7474
".clang-format",
7575
"__setup.py",
7676
"BUILD.bazel",
77-
"meson*",
77+
"**meson**",
7878
"MODS.md",
7979
"WORKSPACE",
80+
"nuget/",
81+
"nuget/README.md",
82+
"src/*.bazel*",
83+
"src/*.meson*",
84+
"interfaces/*csharp*",
85+
"interfaces/*fortran*",
86+
"flake.*",
87+
"highs.pc.in"
8088
]
8189

8290

@@ -90,9 +98,9 @@ sdist.exclude = [
9098
# # The versions of Ninja to allow. If Ninja is not present on the system or does
9199
# # not pass this specifier, it will be downloaded via PyPI if possible. An empty
92100
# # string will disable this check.
93-
# ninja.version = ">=1.5"
101+
# ninja.version = ">=1.5"
94102

95-
# # If CMake is not present on the system or is older required, it will be
103+
# # If Ninja is not present on the system or is older required, it will be
96104
# # downloaded via PyPI if possible. An empty string will disable this check.
97105
# ninja.make-fallback = true
98106

0 commit comments

Comments
 (0)