Bump versions to v1.1.0

.travis.yml

@@ -16,6 +16,8 @@ matrix:
     include:
       - os: linux
         env: CONDA_PY=36
+      - os: linux
+        env: CONDA_PY=37
       - os: osx
         env: CONDA_PY=36
              MACOSX_DEPLOYMENT_TARGET=10.9        

appveyor.yml

@@ -13,6 +13,9 @@ environment:
     - TARGET_ARCH: x64
       CONDA_PY: 36
       CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
+    - TARGET_ARCH: x64
+      CONDA_PY: 37
+      CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
 
 # We always use a 64-bit machine, but can build x86 distributions
 # with the TARGET_ARCH variable.

build-wheels.sh

@@ -4,8 +4,8 @@
 set -e -x
 
 export GLPK_VERSION=4.65
-export PYWR_VERSION=1.0.0
-export PYWR_TAG=v1.0.0
+export PYWR_VERSION=1.1.0
+export PYWR_TAG=v1.1.0
 export WORKDIR=${HOME}
 
 cd ${WORKDIR}

recipe/meta.yaml

@@ -1,6 +1,6 @@
 {% set name = "pywr" %}
-{% set version = "1.0.0" %}
-{% set git_rev = "v1.0.0" %}
+{% set version = "1.1.0" %}
+{% set git_rev = "v1.1.0" %}
 {% set build_number = 0 %}
 
 {% if os.environ.get("FEATURE_OLDGLIBC", "0") == "1" %}
@@ -10,76 +10,71 @@
 {% endif %}
 
 package:
-    name: {{ name|lower }}
-    version: {{ version }}
+  name: {{ name|lower }}
+  version: {{ version }}
 
 source:
-    git_url: https://github.com/pywr/pywr.git
-    git_rev: {{ git_rev }}
+  git_url: https://github.com/pywr/pywr.git
+  git_rev: {{ git_rev }}
 
 build:
-    number: {{ build_number }}
+  number: {{ build_number }}
 
-    script_env:
-        - FEATURE_OLDGLIBC [linux]
+  script_env:
+      - FEATURE_OLDGLIBC [linux]
 
-    {% if OLDGLIBC %}
-    features:
-        - oldglibc
-    {% endif %}
+  features:
+    - vc14  # [win]
+  {% if OLDGLIBC %}
+    - oldglibc
+  {% endif %}
 
 requirements:
   build:
     - python
-    - vc 9  # [win and py27]
-    - vc 10  # [win and py34]
-    - vc 14  # [win and (py35 or py36)]
+    - vc 14  # [win]
     - setuptools
-    - numpy 1.8.*  # [not (win and (py35 or py36))]
-    - numpy 1.9.*  # [win and py35]
-    - numpy 1.11.*  # [win and py36]
+    - numpy
     - cython
     - glpk
     - lp_solve
     - future
     - packaging
+    - wheel
     - setuptools_scm
     {% if OLDGLIBC %}
     - oldglibc
     {% endif %}
   run:
     - python
-    - vc 9  # [win and py27]
-    - vc 10  # [win and py34]
-    - vc 14  # [win and (py35 or py36)]
-    - numpy >=1.8  # [not (win and (py35 or py36))]
-    - numpy >=1.9  # [win and py35]
-    - numpy >=1.11  # [win and py36]
+    - vc 14  # [win]
+    - {{ pin_compatible('numpy') }}
     - pandas
     - networkx
     - glpk
     - lp_solve
     - pytables
     # Fix pytables on windows. See https://github.com/conda-forge/pytables-feedstock/issues/31#issuecomment-410695814
-    - snappy  # [win]    
+    - snappy  # [win]
     - xlrd
     - scipy
     - future
     - packaging
     - jupyter
     - matplotlib
-    {% if OLDGLIBC %}
-    - oldglibc
-{% endif %}
 
 test:
-    requires:
-        - pytest
-    source_files:
-        - tests/*
+  requires:
+    - pytest
+    - nbconvert
+    - pygmo
+    - platypus-opt
+
+  source_files:
+    - tests/*
 
 about:
-    home: https://github.com/pywr/pywr
-    license: GPL
-    license_file: LICENSE.txt
-    summary: Pywr is a generalised network resource allocation model written in Python
+  home: https://github.com/pywr/pywr
+  license: GPL
+  license_file: LICENSE.txt
+  summary: Pywr is a generalised network resource allocation model written in Python

recipe/run_test.bat

@@ -2,6 +2,10 @@ set PYWR_SOLVER=glpk
 py.test -v %SRC_DIR%\tests
 if errorlevel 1 exit 1
 
+set PYWR_SOLVER=glpk-edge
+py.test -v %SRC_DIR%\tests
+if errorlevel 1 exit 1
+
 set PYWR_SOLVER=lpsolve
 py.test -v %SRC_DIR%\tests
 if errorlevel 1 exit 1

recipe/run_test.sh

@@ -1,2 +1,3 @@
 PYWR_SOLVER=glpk pytest -v ${SRC_DIR}/tests
+PYWR_SOLVER=glpk-edge pytest -v ${SRC_DIR}/tests
 PYWR_SOLVER=lpsolve pytest -v ${SRC_DIR}/tests