diff --git a/.travis.yml b/.travis.yml index 555f685..9975a44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,13 @@ dist: xenial language: python python: - "3.7" +before_install: + - sudo add-apt-repository -y ppa:openjdk-r/ppa + - sudo apt-get -qq update + - sudo apt-get install -y openjdk-8-jdk --no-install-recommends + - sudo update-java-alternatives -s java-1.8.0-openjdk-amd64 + - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 + install: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh - bash miniconda.sh -b -p $HOME/miniconda @@ -15,11 +22,6 @@ install: - source activate test-environment - pip install Cython --install-option="--no-cython-compile" - pip install -e .[tests] - - sudo add-apt-repository -y ppa:openjdk-r/ppa - - sudo apt-get -qq update - - sudo apt-get install -y openjdk-8-jdk --no-install-recommends - - sudo update-java-alternatives -s java-1.8.0-openjdk-amd64 - - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 script: - python -c "import keras.backend" diff --git a/requirements.txt b/requirements.txt index 3a789f4..c70e133 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,8 @@ Flask==1.0.2 hyperas==0.4 Keras==2.2.4 numpy==1.19.4 -pyspark==2.4.0 +pyspark==2.4.5 six==1.11.0 tensorflow==1.15.4 -pydl4j>=0.1.3 \ No newline at end of file +pydl4j>=0.1.3 +h5py==2.10.0 \ No newline at end of file diff --git a/setup.py b/setup.py index fe77e87..c0045e5 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,14 @@ download_url='https://github.com/maxpumperla/elephas/tarball/0.4.3', author='Max Pumperla', author_email='max.pumperla@googlemail.com', - install_requires=['cython', 'tensorflow==1.15.4', 'keras==2.2.4', 'hyperas', 'flask', 'six', 'pyspark==2.4.0'], + install_requires=['cython', + 'tensorflow==1.15.4', + 'keras==2.2.4', + 'hyperas', + 'flask', + 'six', + 'h5py==2.10.0' + 'pyspark==2.4.5'], extras_require={ 'java': ['pydl4j>=0.1.3'], 'tests': ['pytest', 'pytest-pep8', 'pytest-cov', 'mock'] diff --git a/tests/utils/test_serialization.py b/tests/utils/test_serialization.py index a9f7319..37a152a 100644 --- a/tests/utils/test_serialization.py +++ b/tests/utils/test_serialization.py @@ -6,7 +6,7 @@ def test_model_to_dict(): model = Sequential() dict_model = serialization.model_to_dict(model) - assert dict_model.keys() == ['model', 'weights'] + assert list(dict_model.keys()) == ['model', 'weights'] def test_dict_to_model():