Merge branch 'master' of https://github.com/pywr/pywr

appveyor.yml

@@ -2,18 +2,10 @@ build: false
 
 environment:
   matrix:
-    - PYTHON_VERSION: 2.7
-      PYTHON_ARCH: 32
-      MINICONDA: C:\Miniconda
-
     - PYTHON_VERSION: 2.7
       PYTHON_ARCH: 64
       MINICONDA: C:\Miniconda-x64
 
-    - PYTHON_VERSION: 3.4
-      PYTHON_ARCH: 32
-      MINICONDA: C:\Miniconda3
-
     - PYTHON_VERSION: 3.4
       PYTHON_ARCH: 64
       MINICONDA: C:\Miniconda3-x64

conda-recipe/bld.bat

@@ -2,5 +2,5 @@ set LIB=%LIBRARY_LIB%;.\lib;%LIB%
 set LIBPATH=%LIBRARY_LIB%;.\lib;%LIBPATH%
 set INCLUDE=%LIBRARY_INC%;%INCLUDE%
 
-"%PYTHON%" setup.py build_ext -I"%LIBRARY_INC%" -L"%LIBRARY_LIB%" install --with-glpk
+"%PYTHON%" setup.py build_ext -I"%LIBRARY_INC%" -L"%LIBRARY_LIB%" install --with-glpk --with-lpsolve
 if errorlevel 1 exit 1

conda-recipe/meta.yaml

@@ -15,12 +15,14 @@ requirements:
     - numpy x.x
     - cython
     - glpk
+    - lpsolve
   run:
     - python
     - numpy x.x
     - pandas
     - networkx
     - glpk
+    - lpsolve
     - pytables
     - xlrd
 

conda-recipe/run_test.py

@@ -3,8 +3,9 @@
 import pytest
 
 tests_folder = os.path.join(os.environ['SRC_DIR'], 'tests')
-result = pytest.main(['-x', tests_folder])
 
-if result != 0:
-    # test(s) failed, raise error
-    sys.exit(result)
+for solver in ('glpk', 'lpsolve'):
+    result = pytest.main(['-x', tests_folder, '--solver={}'.format(solver)])
+    if result != 0:
+        # test(s) failed, raise error
+        sys.exit(result)

setup.py

@@ -14,6 +14,7 @@
 from Cython.Build import cythonize
 import numpy as np
 import sys
+import os
 
 setup_kwargs = {
     'name': 'pywr',
@@ -63,10 +64,14 @@
                   libraries=['glpk'],),
     )
 if 'lpsolve' in optional:
+    define_macros = []
+    if os.name == 'nt':
+        define_macros.append(('WIN32', 1))
     extensions_optional.append(
         Extension('pywr.solvers.cython_lpsolve', ['pywr/solvers/cython_lpsolve.pyx'],
                   include_dirs=[np.get_include()],
-                  libraries=['lpsolve55'],),
+                  libraries=['lpsolve55'],
+                  define_macros=define_macros),
     )
 
 # build the core extension(s)