updated gsw dependency

hydroffice · Feb 19, 2019 · d491105 · d491105
1 parent 27ef4e0
commit d491105
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,12 +36,12 @@ install:
  - conda create -q -n test-environment python=$PYTHON_VERSION
  - source activate test-environment
  - pip install PySide2
- - conda install numpy=1.16.0 matplotlib-base gdal pyproj scipy basemap netCDF4 pillow cython
+ - conda install numpy=1.15.3 matplotlib-base gdal pyproj scipy basemap netCDF4 pillow cython
  - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
  conda remove --force PyQt Qt sip;
  export LD_LIBRARY_PATH=$HOME/miniconda/envs/test-environment/lib:$LD_LIBRARY_PATH;
  fi
- - pip install gsw==3.0.6
+ - pip install gsw
  - pip install coveralls
  - pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
  - pip install .

diff --git a/appveyor.yml b/appveyor.yml
@@ -37,8 +37,8 @@ install:
 
  - pip install coveralls
  - pip install PySide2
- - pip install gsw==3.0.6
- - conda install numpy=1.16.0 matplotlib-base gdal pyproj scipy basemap netCDF4 pillow cython
+ - conda install numpy=1.15.3 matplotlib-base gdal pyproj scipy basemap netCDF4 pillow cython
+ - pip install gsw
  - pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
 
 build: off

diff --git a/setup.py b/setup.py
@@ -63,7 +63,7 @@ def find_version(*file_paths):
  ],
  install_requires=[
  "hyo2.abc",
- "gsw==3.0.6", # install it from github without scipy dependency, version == 3.0.6
+ "gsw>=3.3.0",
  "netCDF4",
  "pillow",
  "pyserial",