Skip to content
This repository was archived by the owner on Nov 5, 2024. It is now read-only.

Commit fa404f8

Browse files
dependabot[bot]yqshao
authored andcommitted
Bump tensorflow from 1.13.1 to 1.15.0 in /doc (#1)
* Bump tensorflow from 1.13.1 to 1.15.0 in /doc Bumps [tensorflow](https://github.com/tensorflow/tensorflow) from 1.13.1 to 1.15.0. - [Release notes](https://github.com/tensorflow/tensorflow/releases) - [Changelog](https://github.com/tensorflow/tensorflow/blob/master/RELEASE.md) - [Commits](tensorflow/tensorflow@v1.13.1...v1.15.0) Signed-off-by: dependabot[bot] <[email protected]> * Update README, Docker and CircleCI config
1 parent f313375 commit fa404f8

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

.circleci/config.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,24 @@ jobs:
2323
- checkout
2424
- restore_cache:
2525
keys:
26-
- venv-{{ checksum "requirements-dev.txt" }}-{{ checksum ".circleci/config.yml" }}
26+
- venv-{{ checksum "requirements-dev.txt" }}-{{ checksum "setup.py" }}-{{ checksum ".circleci/config.yml" }}
2727
- venv-
2828
- run:
2929
name: Install dependencies
3030
command: |
3131
python3 -m venv venv
3232
. venv/bin/activate
33-
pip install tensorflow==1.13.1
33+
# pip need to be upgraded for TF 1.15
34+
pip install --upgrade pip
35+
# Install the requirements but remove PiNN
36+
pip install -e .
37+
pip uninstall -y pinn
38+
# Install requirements for testing
3439
pip install -r requirements-dev.txt
3540
- save_cache:
3641
paths:
3742
- ./venv
38-
key: venv-{{ checksum "requirements-dev.txt" }}-{{ checksum ".circleci/config.yml" }}
43+
key: venv-{{ checksum "requirements-dev.txt" }}-{{ checksum "setup.py" }}-{{ checksum ".circleci/config.yml" }}
3944
pytest:
4045
docker:
4146
- image: circleci/python:3.6.1
@@ -44,7 +49,7 @@ jobs:
4449
- checkout
4550
- restore_cache:
4651
keys:
47-
- venv-{{ checksum "requirements-dev.txt" }}-{{ checksum ".circleci/config.yml" }}
52+
- venv-{{ checksum "requirements-dev.txt" }}-{{ checksum "setup.py" }}-{{ checksum ".circleci/config.yml" }}
4853
- run:
4954
name: run tests
5055
command: |
@@ -61,12 +66,12 @@ jobs:
6166
- checkout
6267
- restore_cache:
6368
keys:
64-
- venv-{{ checksum "requirements-dev.txt" }}-{{ checksum ".circleci/config.yml" }}
69+
- venv-{{ checksum "requirements-dev.txt" }}-{{ checksum "setup.py" }}-{{ checksum ".circleci/config.yml" }}
6570
- run:
6671
name: Deploy doc
6772
command: |
68-
. venv/bin/activate
6973
sudo apt-get update
70-
sudo apt-get install pandoc
74+
sudo apt-get install pandoc
75+
. venv/bin/activate
7176
pip install -e .
7277
./.circleci/build_doc.sh

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tensorflow/tensorflow:1.13.1-py3-jupyter
1+
FROM tensorflow/tensorflow:1.15.0-py3-jupyter
22

33
# Install PiNN
44
COPY . /opt/src/pinn

Dockerfile-gpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tensorflow/tensorflow:1.13.1-gpu-py3-jupyter
1+
FROM tensorflow/tensorflow:1.15.0-gpu-py3-jupyter
22

33
# Install PiNN
44
COPY . /opt/src/pinn

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Reference
3131
Requirements
3232
============
3333
- Python 3
34-
- TensorFlow (tested with 1.13.1)
34+
- TensorFlow 1.15
3535
- ASE
3636

3737
Installation

doc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tensorflow==1.13.1
1+
tensorflow==1.15.0

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
author_email='[email protected]',
99
license='BSD',
1010
packages=find_packages(),
11-
install_requires=['ase', 'numpy', 'pyyaml'],
11+
install_requires=['ase', 'numpy', 'pyyaml', 'tensorflow==1.15'],
1212
entry_points={
1313
'console_scripts': ['pinn_train=pinn.trainer:main']
1414
}

0 commit comments

Comments
 (0)