Skip to content

Commit 914a423

Browse files
committed
merged master into upstream
2 parents 73dac41 + 32caac7 commit 914a423

Some content is hidden

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

69 files changed

+1665
-1283
lines changed

.github/workflows/coverage.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
4444
- name: Run pyscipopt tests
4545
run: |
46+
sudo apt-get install tzdata locales -y && sudo locale-gen pt_PT && sudo update-locale # add pt_PT locale that is used in tests
4647
coverage run -m pytest
4748
coverage report -m
4849
coverage xml

.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
- name: Install dependencies (SCIPOptSuite)
110110
if: steps.cache-scip.outputs.cache-hit != 'true'
111111
run: |
112-
brew install tbb boost
112+
brew install tbb boost bison
113113
wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/scipoptsuite-${{ env.version }}.tgz
114114
tar xfz scipoptsuite-${{ env.version }}.tgz
115115
cd scipoptsuite-${{ env.version }}

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,22 @@
22

33
## Unreleased
44
### Added
5+
- Added check for pt_PT locale in test_model.py
6+
### Fixed
7+
### Changed
8+
### Removed
9+
10+
## 5.0.1 - 2024-04-05
11+
### Added
12+
- Added recipe for nonlinear objective functions
13+
- Added method for adding piecewise linear constraints
514
- Add SCIP function SCIPgetTreesizeEstimation and wrapper getTreesizeEstimation
15+
- New test for model setLogFile
616
### Fixed
17+
- Fixed model.setLogFile(None) error
18+
- Add recipes sub-package
19+
- Fixed "weakly-referenced object no longer exists" when calling dropEvent in test_customizedbenders
20+
- Fixed incorrect writing/printing when user had a non-default locale
721
### Changed
822
### Removed
923

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Building and solving a model
5555

5656
There are several [examples](https://github.com/scipopt/PySCIPOpt/blob/master/examples/finished) and
5757
[tutorials](https://github.com/scipopt/PySCIPOpt/blob/master/examples/tutorial). These display some functionality of the
58-
interface and can serve as an entry point for writing more complex code.
58+
interface and can serve as an entry point for writing more complex code. Some of the common usecases are also available in the [recipes](https://github.com/scipopt/PySCIPOpt/blob/master/src/pyscipopt/recipes) sub-package.
5959
You might also want to have a look at this article about PySCIPOpt:
6060
<https://opus4.kobv.de/opus4-zib/frontdoor/index/index/docId/6045>. The
6161
following steps are always required when using the interface:

0 commit comments

Comments
 (0)