Skip to content

Commit 62eb5c7

Browse files
committed
Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into makeMoreConst
2 parents 9b1c5a6 + 4aeaf39 commit 62eb5c7

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/checkout@v4
6060

6161
- name: Build wheels
62-
uses: pypa/cibuildwheel@v2.21
62+
uses: pypa/cibuildwheel@v3.0
6363
env:
6464
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
6565

.github/workflows/build-wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: build-wheels
22

3-
on: [push]
4-
# on: [pull_request]
3+
# on: [push]
4+
on: [pull_request]
55

66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
@@ -47,6 +47,6 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@v4
4949
- name: Build wheels
50-
uses: pypa/cibuildwheel@v2.21
50+
uses: pypa/cibuildwheel@v3.0
5151
env:
5252
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

highs/simplex/HEkk.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3950,7 +3950,7 @@ void HEkk::clearBadBasisChangeTabooFlag() {
39503950
bad_basis_change_[iX].taboo = false;
39513951
}
39523952

3953-
bool HEkk::tabooBadBasisChange() {
3953+
bool HEkk::tabooBadBasisChange() const {
39543954
for (HighsInt iX = 0; iX < (HighsInt)bad_basis_change_.size(); iX++) {
39553955
if (bad_basis_change_[iX].taboo) return true;
39563956
}

highs/simplex/HEkk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class HEkk {
359359
const BadBasisChangeReason reason,
360360
const bool taboo = false);
361361
void clearBadBasisChangeTabooFlag();
362-
bool tabooBadBasisChange();
362+
bool tabooBadBasisChange() const;
363363
void applyTabooRowOut(vector<double>& values, const double overwrite_with);
364364
void unapplyTabooRowOut(vector<double>& values);
365365
void applyTabooVariableIn(vector<double>& values,

highs/util/stringutil.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <algorithm> // for std::transform
1111
#include <cassert>
12+
#include <cctype>
1213

1314
/*
1415
void strRemoveWhitespace(char* str) {

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,11 @@ testpaths = ["tests"]
202202

203203
[tool.cibuildwheel]
204204
build = "*"
205-
skip = "cp3{6,7}-*"
205+
archs = ["auto64", "auto32"]
206206

207207
# Enable free-threaded support
208-
free-threaded-support = true
208+
enable = ["cpython-freethreading"]
209209

210210
test-command = "pytest {project}/tests"
211211
test-extras = ["test", "numpy"]
212-
test-skip = ["*universal2:arm64"]
213212
build-verbosity = 1

0 commit comments

Comments
 (0)