recipy · oew1v07 · Oct 17, 2018 · Oct 17, 2018 · Oct 18, 2018 · Oct 18, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,13 @@ install:
     nibabel
     gdal imageio tifffile xarray rasterio netCDF4
     iris
+    joblib
   - source activate test-environment
+  # Install packages conditionally depending on python version
+  - if [[ ("$TRAVIS_PYTHON_VERSION" == "2.7" ) || ( "$TRAVIS_PYTHON_VERSION" == "3.5" ) || ( "$TRAVIS_PYTHON_VERSION" == "3.6" ) ]];
+    then
+      conda install tensorflow keras>=2.2.4;
+    fi
   # Copy matplotlib configuration so it does not try and plot to
   # screen, which can cause matplotlib tests to fail.
   - cp integration_test/packages/matplotlibrc .
@@ -57,7 +63,6 @@ install:
   - python -c "import sys, pprint; pprint.pprint(sys.path)"
   - python -c "import tinydb"
 
-
 script:
   # Run py.test with 'v' (verbose) to show test function names and
   # 'rs' to show reasons for skipped tests

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,16 +1,15 @@
 build: false
 
 environment:
-
   matrix:
-    - PYTHON_VERSION: 2.7
-      MINICONDA: C:\Miniconda
-    - PYTHON_VERSION: 3.4
-      MINICONDA: C:\Miniconda3
+    # - PYTHON_VERSION: 2.7
+    #   MINICONDA: C:\Miniconda-x64
+    # - PYTHON_VERSION: 3.4
+    #   MINICONDA: C:\Miniconda3-x64
     - PYTHON_VERSION: 3.5
-      MINICONDA: C:\Miniconda3
+      MINICONDA: C:\Miniconda3-x64
     - PYTHON_VERSION: 3.6
-      MINICONDA: C:\Miniconda3
+      MINICONDA: C:\Miniconda3-x64
 
 init:
   - "ECHO %PYTHON_VERSION% %MINICONDA%"
@@ -39,8 +38,22 @@ install:
     scikit-image
     nibabel
     gdal imageio tifffile xarray rasterio netCDF4
-    iris"
+    iris
+    joblib"
   - activate test-environment
+  # Install dependencies for keras if the python version allows it
+  # If statement error suggests that python version and temp var might be
+  # empty - this checks that it isn't
+  - ECHO %PYTHON_VERSION%
+  - set TEMP_VAR=0
+  - IF %PYTHON_VERSION%==3.5 set TEMP_VAR=1
+  - IF %PYTHON_VERSION%==3.6 set TEMP_VAR=1
+  - ECHO %TEMP_VAR%
+  - IF %TEMP_VAR%==1 (
+      conda install tensorflow keras>=2.2.4 pytables
+      ) else (
+        ECHO Not installing keras.
+      )
   # Copy matplotlib configuration so it does not try and plot to 
   # screen, which can cause matplotlib tests to fail.
   - copy integration_test\packages\matplotlibrc .
@@ -58,3 +71,6 @@ test_script:
   # Run py.test with 'v' (verbose) to show test function names and  
   # 'rs' to show reasons for skipped tests
   - py.test -v -rs integration_test
+
+on_finish:
+  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
diff --git a/integration_test/config/test_packages.yml b/integration_test/config/test_packages.yml
@@ -293,3 +293,28 @@ test_cases:
   inputs: [ cube1.nc ]
 - arguments: [ save ]
   outputs: [ cube.nc ]
+---
+script: run_keras.py
+libraries: [ keras ]
+test_cases:
+- arguments: [ datagenerator_flowdirectory ]
+  inputs: [ keras ]
+  skip_py_version: [ 2.7, 3.4, 3.7 ]
+- arguments: [ saveweights ]
+  inputs: ['mnist.npz']
+  outputs: [ Model_Weights_test.h5 ]
+  skip_py_version: [ 2.7, 3.4, 3.7 ]
+- arguments: [ savemodel ]
+  inputs: ['mnist.npz']
+  outputs: [ Whole_Model_test.h5 ]
+  skip_py_version: [ 2.7, 3.4, 3.7 ]
+- arguments: [ callback_saveweights ]
+  inputs: ['mnist.npz']
+  outputs: [ model_01.hdf5, model_02.hdf5 ]
+  skip_py_version: [ 2.7, 3.4, 3.7 ]
+- arguments: [ loadweights ]
+  inputs: [ Model_Weights.h5 ]
+  skip_py_version: [ 2.7, 3.4, 3.7 ]
+- arguments: [ loadmodel ]
+  inputs: [ Whole_Model.h5 ]
+  skip_py_version: [ 2.7, 3.4, 3.7 ] 
diff --git a/integration_test/packages/data/keras/Model_Weights.h5 b/integration_test/packages/data/keras/Model_Weights.h5
diff --git a/integration_test/packages/data/keras/Whole_Model.h5 b/integration_test/packages/data/keras/Whole_Model.h5
diff --git a/integration_test/packages/data/keras/class0/mnist02.jpg b/integration_test/packages/data/keras/class0/mnist02.jpg
diff --git a/integration_test/packages/data/keras/class0/mnist22.jpg b/integration_test/packages/data/keras/class0/mnist22.jpg
diff --git a/integration_test/packages/data/keras/class1/mnist04.jpg b/integration_test/packages/data/keras/class1/mnist04.jpg
diff --git a/integration_test/packages/data/keras/class1/mnist07.jpg b/integration_test/packages/data/keras/class1/mnist07.jpg
diff --git a/integration_test/packages/data/keras/class1/mnist09.jpg b/integration_test/packages/data/keras/class1/mnist09.jpg
diff --git a/integration_test/packages/data/keras/class1/mnist15.jpg b/integration_test/packages/data/keras/class1/mnist15.jpg
diff --git a/integration_test/packages/data/keras/class1/mnist24.jpg b/integration_test/packages/data/keras/class1/mnist24.jpg
diff --git a/integration_test/packages/data/keras/class1/mnist25.jpg b/integration_test/packages/data/keras/class1/mnist25.jpg
diff --git a/integration_test/packages/data/keras/class2/mnist06.jpg b/integration_test/packages/data/keras/class2/mnist06.jpg
diff --git a/integration_test/packages/data/keras/class2/mnist17.jpg b/integration_test/packages/data/keras/class2/mnist17.jpg
diff --git a/integration_test/packages/data/keras/class2/mnist26.jpg b/integration_test/packages/data/keras/class2/mnist26.jpg
diff --git a/integration_test/packages/data/keras/class2/mnist29.jpg b/integration_test/packages/data/keras/class2/mnist29.jpg
diff --git a/integration_test/packages/data/keras/class3/mnist08.jpg b/integration_test/packages/data/keras/class3/mnist08.jpg
diff --git a/integration_test/packages/data/keras/class3/mnist11.jpg b/integration_test/packages/data/keras/class3/mnist11.jpg
diff --git a/integration_test/packages/data/keras/class3/mnist13.jpg b/integration_test/packages/data/keras/class3/mnist13.jpg
diff --git a/integration_test/packages/data/keras/class3/mnist28.jpg b/integration_test/packages/data/keras/class3/mnist28.jpg
diff --git a/integration_test/packages/data/keras/class3/mnist31.jpg b/integration_test/packages/data/keras/class3/mnist31.jpg
diff --git a/integration_test/packages/data/keras/class4/mnist03.jpg b/integration_test/packages/data/keras/class4/mnist03.jpg
diff --git a/integration_test/packages/data/keras/class4/mnist10.jpg b/integration_test/packages/data/keras/class4/mnist10.jpg
diff --git a/integration_test/packages/data/keras/class4/mnist21.jpg b/integration_test/packages/data/keras/class4/mnist21.jpg
diff --git a/integration_test/packages/data/keras/class4/mnist27.jpg b/integration_test/packages/data/keras/class4/mnist27.jpg
diff --git a/integration_test/packages/data/keras/class5/mnist01.jpg b/integration_test/packages/data/keras/class5/mnist01.jpg
diff --git a/integration_test/packages/data/keras/class5/mnist12.jpg b/integration_test/packages/data/keras/class5/mnist12.jpg
diff --git a/integration_test/packages/data/keras/class6/mnist14.jpg b/integration_test/packages/data/keras/class6/mnist14.jpg
diff --git a/integration_test/packages/data/keras/class6/mnist19.jpg b/integration_test/packages/data/keras/class6/mnist19.jpg
diff --git a/integration_test/packages/data/keras/class7/mnist16.jpg b/integration_test/packages/data/keras/class7/mnist16.jpg
diff --git a/integration_test/packages/data/keras/class7/mnist30.jpg b/integration_test/packages/data/keras/class7/mnist30.jpg
diff --git a/integration_test/packages/data/keras/class8/mnist18.jpg b/integration_test/packages/data/keras/class8/mnist18.jpg
diff --git a/integration_test/packages/data/keras/class8/mnist32.jpg b/integration_test/packages/data/keras/class8/mnist32.jpg
diff --git a/integration_test/packages/data/keras/class9/mnist05.jpg b/integration_test/packages/data/keras/class9/mnist05.jpg
diff --git a/integration_test/packages/data/keras/class9/mnist20.jpg b/integration_test/packages/data/keras/class9/mnist20.jpg
diff --git a/integration_test/packages/data/keras/class9/mnist23.jpg b/integration_test/packages/data/keras/class9/mnist23.jpg
diff --git a/integration_test/packages/data/keras/mnist.npz b/integration_test/packages/data/keras/mnist.npz