Merge pull request scipopt#90 from SCIP-Interfaces/scip-401

Update to SCIP 4.0.1

.travis.yml

@@ -1,28 +1,29 @@
 language: python
 
 python:
-- '2.7'
-- '3.6'
+  - '2.7'
+  - '3.6'
 
 notifications:
   email: false
 
+before_install:
+  - export VERSION=4.0.1
+  - wget http://scip.zib.de/download/release/scipoptsuite-$VERSION.tgz
+  - tar xf scipoptsuite-$VERSION.tgz
+  - cd scipoptsuite-$VERSION
+  - mkdir build
+  - cd build; cmake .. -DCMAKE_INSTALL_PREFIX=~/scipdir; make -j8 install; cd ..
+  - cd ..
+
 install:
-- export VERSION=4.0.0
-- pip install cython networkx pytest-cov codecov
-- wget http://scip.zib.de/download/release/scipoptsuite-$VERSION.tgz
-- tar xzf scipoptsuite-$VERSION.tgz
-- cd scipoptsuite-$VERSION
-- make COMP=clang SHARED=true GMP=false READLINE=false ZIMPL=false
-- make install INSTALLDIR=~/scipdir COMP=clang SHARED=true GMP=false READLINE=false
-  ZIMPL=false
-- cd ..
-- env SCIPOPTDIR=~/scipdir python setup.py install
+  - pip install cython networkx pytest-cov codecov
+  - SCIPOPTDIR=~/scipdir python setup.py install
 
 script: py.test --cov tests
 
 after_success:
-- codecov
+  - codecov
 
 deploy:
   provider: pypi

INSTALL.rst

@@ -26,7 +26,7 @@ the SCIP Optimization Suite):
 
     SCIPOPTDIR
       > lib
-        > libscipopt.so ...
+        > libscip.so ...
       > include
         > scip
         > lpi

appveyor.yml

@@ -11,25 +11,20 @@ environment:
   PIP: C:\Python36-x64\Scripts\pip
   PYTEST: C:\Python36-x64\Scripts\pytest
   TWINE: C:\Python36-x64\Scripts\twine
+  SCIPOPTDIR: C:\scipoptdir
   password:
     secure: HEa8MAJyyfSv33snyK3Gleflk9SIfZBxbnTiS39hlWM=
 
 install:
-  - cmd: "set PATH=%PYTHON%;%PATH%"  
+  - cmd: "set PATH=%PYTHON%;%PATH%"
   - cmd: "%PIP% install cython networkx pytest wheel twine"
-  - mkdir scipoptdir    
-  - cd scipoptdir    
-  - ps: wget http://scip.zib.de/download/release/scip-4.0.0.win.x86_64.vc14.opt.spx2.lib.zip -outfile scipopt.zip    
-  - ps: wget http://scip.zib.de/download/release/scipoptheaders-4.0.0.zip -outfile headers.zip    
-  - ps: Expand-Archive .\scipopt.zip -DestinationPath lib    
-  - ps: Expand-Archive .\headers.zip -DestinationPath .    
-  - set SCIPOPTDIR=%cd%    
-  - cd ..
-  - set PATH=%SCIPOPTDIR%\lib;%PATH%"
+  - ps: wget http://scip.zib.de/download/release/SCIPOptSuite-4.0.1-win64.exe -outfile scipopt-installer.exe
+  - scipopt-installer.exe /S /D=%SCIPOPTDIR%
+  - set PATH=%SCIPOPTDIR%\bin;%PATH%"
 
 build_script:
   - python setup.py install
-    
+
 test_script:
   - cmd: "%PYTEST% tests"
 

setup.py

@@ -3,11 +3,12 @@
 
 # look for environment variable that specifies path to SCIP Opt lib and headers
 scipoptdir = os.environ.get('SCIPOPTDIR', '')
-
+print("scipoptir: " + scipoptdir)
 includedir = os.path.abspath(os.path.join(scipoptdir, 'include'))
 libdir = os.path.abspath(os.path.join(scipoptdir, 'lib'))
-
-libname = 'libscipopt' if os.name == 'nt' else 'scipopt'
+print("includedir: " + includedir)
+print("libdir: " + libdir)
+libname = 'scip'
 
 cythonize = True
 
@@ -54,7 +55,7 @@
 
 setup(
     name = 'PySCIPOpt',
-    version = '1.1.3',
+    version = '1.2.0',
     description = 'Python interface and modeling environment for SCIP',
     url = 'https://github.com/SCIP-Interfaces/PySCIPOpt',
     author = 'Zuse Institute Berlin',