Skip to content

Commit c554beb

Browse files
author
Christoph Graczyk
committed
remove mac integration test, update changelog, prepare release
1 parent c9fafb4 commit c554beb

File tree

3 files changed

+73
-59
lines changed

3 files changed

+73
-59
lines changed

‎.github/workflows/integration-test.yml

+57-57
Original file line numberDiff line numberDiff line change
@@ -83,63 +83,63 @@ jobs:
8383
run: |
8484
py.test
8585
86-
MacOS-test:
87-
runs-on: macos-latest
88-
strategy:
89-
matrix:
90-
python-version: [3.8, 3.9]
91-
steps:
92-
- uses: actions/checkout@v2
93-
94-
- name: Cache dependencies (SCIPOptSuite)
95-
id: cache-scip
96-
uses: actions/cache@v2
97-
with:
98-
path: |
99-
${{ runner.workspace }}/scipoptsuite
100-
~/Library/Caches/Homebrew/tbb@2020--*
101-
/usr/local/opt/tbb@2020*
102-
~/Library/Caches/Homebrew/downloads/*--tbb@2020-*
103-
~/Library/Caches/Homebrew/boost--*
104-
/usr/local/opt/boost*
105-
~/Library/Caches/Homebrew/downloads/*--boost-*
106-
key: ${{ runner.os }}-scipopt-${{ env.version }}-${{ hashFiles('**/lockfiles') }}
107-
restore-keys: |
108-
${{ runner.os }}-scipopt-${{ env.version }}-
109-
110-
- name: Install dependencies (SCIPOptSuite)
111-
if: steps.cache-scip.outputs.cache-hit != 'true'
112-
run: |
113-
brew install tbb@2020 boost
114-
wget --quiet --no-check-certificate https://scipopt.org/download/release/scipoptsuite-${{ env.version }}.tgz
115-
tar xfz scipoptsuite-${{ env.version }}.tgz
116-
cd scipoptsuite-${{ env.version }}
117-
mkdir build
118-
cd build
119-
cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ runner.workspace }}/scipoptsuite -DIPOPT=off -DSYM=none -DTPI=tny -DREADLINE=off -DTBB_LIBRARY_DIR=/usr/local/opt/tbb@2020/lib
120-
make install -j
121-
122-
- name: Setup python ${{ matrix.python-version }}
123-
uses: actions/setup-python@v2
124-
with:
125-
python-version: ${{ matrix.python-version }}
126-
127-
- name: Prepare python environment
128-
run: |
129-
python -m pip install --upgrade pip
130-
python -m pip install wheel cython networkx pytest-cov pytest
131-
132-
- name: Install PySCIPOpt
133-
run: |
134-
export SCIPOPTDIR=${{ runner.workspace }}/scipoptsuite/
135-
export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ runner.workspace }}/scipoptsuite/lib
136-
python -m pip install .
137-
138-
- name: Run pyscipopt tests
139-
run: |
140-
export SCIPOPTDIR=${{ runner.workspace }}/scipoptsuite/
141-
export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ runner.workspace }}/scipoptsuite/lib
142-
py.test
86+
# MacOS-test:
87+
# runs-on: macos-latest
88+
# strategy:
89+
# matrix:
90+
# python-version: [3.8, 3.9]
91+
# steps:
92+
# - uses: actions/checkout@v2
93+
#
94+
# - name: Cache dependencies (SCIPOptSuite)
95+
# id: cache-scip
96+
# uses: actions/cache@v2
97+
# with:
98+
# path: |
99+
# ${{ runner.workspace }}/scipoptsuite
100+
# ~/Library/Caches/Homebrew/tbb@2020--*
101+
# /usr/local/opt/tbb@2020*
102+
# ~/Library/Caches/Homebrew/downloads/*--tbb@2020-*
103+
# ~/Library/Caches/Homebrew/boost--*
104+
# /usr/local/opt/boost*
105+
# ~/Library/Caches/Homebrew/downloads/*--boost-*
106+
# key: ${{ runner.os }}-scipopt-${{ env.version }}-${{ hashFiles('**/lockfiles') }}
107+
# restore-keys: |
108+
# ${{ runner.os }}-scipopt-${{ env.version }}-
109+
#
110+
# - name: Install dependencies (SCIPOptSuite)
111+
# if: steps.cache-scip.outputs.cache-hit != 'true'
112+
# run: |
113+
# brew install tbb@2020 boost
114+
# wget --quiet --no-check-certificate https://scipopt.org/download/release/scipoptsuite-${{ env.version }}.tgz
115+
# tar xfz scipoptsuite-${{ env.version }}.tgz
116+
# cd scipoptsuite-${{ env.version }}
117+
# mkdir build
118+
# cd build
119+
# cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ runner.workspace }}/scipoptsuite -DIPOPT=off -DSYM=none -DTPI=tny -DREADLINE=off -DTBB_LIBRARY_DIR=/usr/local/opt/tbb@2020/lib
120+
# make install -j
121+
#
122+
# - name: Setup python ${{ matrix.python-version }}
123+
# uses: actions/setup-python@v2
124+
# with:
125+
# python-version: ${{ matrix.python-version }}
126+
#
127+
# - name: Prepare python environment
128+
# run: |
129+
# python -m pip install --upgrade pip
130+
# python -m pip install wheel cython networkx pytest-cov pytest
131+
#
132+
# - name: Install PySCIPOpt
133+
# run: |
134+
# export SCIPOPTDIR=${{ runner.workspace }}/scipoptsuite/
135+
# export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ runner.workspace }}/scipoptsuite/lib
136+
# python -m pip install .
137+
#
138+
# - name: Run pyscipopt tests
139+
# run: |
140+
# export SCIPOPTDIR=${{ runner.workspace }}/scipoptsuite/
141+
# export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${{ runner.workspace }}/scipoptsuite/lib
142+
# py.test
143143

144144
### if you need valgrind on mac, you can install it via
145145
# brew tap LouisBrunner/valgrind

‎CHANGELOG.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,29 @@
33
## Unreleased
44
### Added
55
### Fixed
6+
### Changed
7+
### Removed
8+
9+
## 3.5.0 - 2021-12-07
10+
### Added
11+
### Fixed
612
- close file descriptors after file operation is finished
7-
- delete variable pointer from model when calling delVar
13+
- fixed deletion of variable pointer from model when calling delVar
14+
- fixed scip install for MAC integration test
15+
- Fixing assert failure if scip is compiled using quadprecision
16+
- fixed missing GIL by @AntoinePrv in #539
817
### Changed
18+
- changed integration test to include scip TPI (tinycthreads)
919
### Removed
20+
- removed Mac integration test until the segmentation fault in test_memory.py is fixed on Mac
1021

1122
## 3.4.0 - 2021-10-30
1223
### Added
1324
- add support for concurrent optimization
1425
- note that SCIP needs to be linked to a TPI (task processing interface) to use this feature
26+
- SCIPsolverConcurrent implementation from issue #229 by @TNonet in #535
27+
- fix action to also run on external PRs by @mattmilten in #536
28+
- fix concurrent solve test by @mattmilten in #537
1529

1630
## 3.3.0 - 2021-08-23
1731
### Added

‎src/pyscipopt/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '3.4.0'
1+
__version__ = '3.5.0'
22

33
# required for Python 3.8 on Windows
44
import os

0 commit comments

Comments
 (0)