Skip to content

Commit

Permalink
Merge pull request #71 from SCIP-Interfaces/rs/scip600
Browse files Browse the repository at this point in the history
Update to SCIP 6.0.0
  • Loading branch information
rschwarz committed Oct 21, 2018
2 parents 6f6b90f + b07e256 commit 2b596de
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ but there is an issue (#46) since the update to SCIP 4.0.0.

Follow the steps below to get SCIP.jl working. Unfortunately, these steps can not be automated as part of `Pkg.build("SCIP")`, because the academic license of SCIP does not allow distribution of the source code without tracking the download metadata. See the [license](http://scip.zib.de/academic.txt) for details.

1.The SCIP.jl package requires [SCIP](http://scip.zib.de/) to be installed in the newest version (5.0.0).
1.The SCIP.jl package requires [SCIP](http://scip.zib.de/) to be installed in a recent version (e.g. 6.0.0).
[Download](http://scip.zib.de) the SCIP Optimization Suite.
```
tar xzf scipoptsuite-5.0.0.tgz
tar xzf scipoptsuite-6.0.0.tgz
```

2.Choose an installation path and set the **environment variable `SCIPOPTDIR`** to point there.
Expand Down
2 changes: 1 addition & 1 deletion deps/csip_version.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# required version and utilities in a single location
CSIP_VERSION = "0.5.2"
CSIP_VERSION = "0.6.0"

function vn2int(vn::VersionNumber)
100*vn.major + 10*vn.minor + vn.patch
Expand Down
4 changes: 2 additions & 2 deletions travis_docker_test_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ PKGNAME="SCIP"
cd /mnt && if [[ -a .git/shallow ]]; then git fetch --unshallow; fi

# install SCIP
wget http://scip.zib.de/download/release/SCIPOptSuite-5.0.1-Linux.deb
dpkg -i SCIPOptSuite-5.0.1-Linux.deb
wget http://scip.zib.de/download/release/SCIPOptSuite-6.0.0-Linux.deb
dpkg -i SCIPOptSuite-6.0.0-Linux.deb
export SCIPOPTDIR="/usr"

# run tests
Expand Down

0 comments on commit 2b596de

Please sign in to comment.