Merge pull request #118 from jcrivenaes/travis

Tuning on travis, numpy versions, and adding 3.4 and 3.5 wheels
equinor · May 16, 2019 · 6cba788 · 6cba788
2 parents 506d45c + 8e7c642
commit 6cba788
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ env:
   - PLAT=x86_64
   - MB_PYTHON_VERSION=$TRAVIS_PYTHON_VERSION
   - VERSION=$(echo $TRAVIS_TAG)
-  - BUILD_DEPENDS="cmake numpy"
+  - BUILD_DEPENDS="cmake numpy==1.10.4 pandas==0.19"
   - CONFIG_PATH=scripts/config.sh
   - TEST_DEPENDS="pytest"
 
@@ -37,11 +37,18 @@ matrix:
   - os: linux
     env: MB_PYTHON_VERSION=2.7
   - os: linux
-    env: MB_PYTHON_VERSION=3.6
+    env: MB_PYTHON_VERSION=3.4
+  - os: linux
+    env: MB_PYTHON_VERSION=3.5
+  - os: linux
+    env:
+      - MB_PYTHON_VERSION=3.6
+      - BUILD_DEPENDS="cmake numpy>=1.14 pandas"
   - os: linux
     env:
       - MB_PYTHON_VERSION=3.7
       - SOURCEDEPLOY=1
+      - BUILD_DEPENDS="cmake numpy>=1.14 pandas"
 
 before_install:
   - echo "PWD is $PWD"
@@ -68,9 +75,7 @@ after_success:
 - ls -l ${TRAVIS_BUILD_DIR}/dist
 
 before_deploy:
-- ls -la dist
 - pip install numpy
-- uname -a
 
 deploy:
   provider: pypi
@@ -81,4 +86,5 @@ deploy:
   password: $PYPI_PASSWORD
   on:
     tags: True
+    repo: equinor/xtgeo
     # condition: -z $SOURCEDEPLOY
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,10 @@
 # History (changelog) #
 
-## dev ##
+## 2.0.3 ##
+
+  * Deploy to python 3.4 and 3.5 also. Numpy versions tuned to match roxar library.
+
+## 2.0.2 ##
 
   * Adding services for code improvements (codacy, bandit)
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
-numpy>=1.10
-shapely>=1.6.4
+numpy>=1.10.4
+shapely>=1.6
 matplotlib>=1.5
 scipy>=0.17
 segyio>=1.4
-pandas>=0.17
+pandas>=0.19
 six>=1.11