Skip to content

Commit

Permalink
downrev h5py version
Browse files Browse the repository at this point in the history
  • Loading branch information
danielenricocahall committed Dec 30, 2020
1 parent c5f68d1 commit 0640d68
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
pydl4j>=0.1.3
h5py==2.10.0
9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@
download_url='https://github.com/maxpumperla/elephas/tarball/0.4.3',
author='Max Pumperla',
author_email='[email protected]',
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']
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/test_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down

0 comments on commit 0640d68

Please sign in to comment.