Skip to content

Commit

Permalink
Update docker.
Browse files Browse the repository at this point in the history
  • Loading branch information
shyuep committed Dec 23, 2017
1 parent 8c9cb49 commit bb2b41c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
7 changes: 4 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@ jobs:
py3test:
working_directory: ~/pymatgen
docker:
- image: materialsvirtuallab/circle-ci-pmg-py3:0.0.1
- image: circleci/python:3.6.4
steps:
- checkout
- run:
command: |
python3 -m testenv testenv
source testenv/bin/activate
mkdir coverage_reports
pip install numpy
pip install -r requirements.txt -r requirements-optional.txt
- run:
command: |
source testenv/bin/activate
python setup.py --quiet develop
export PATH=$PATH:`pwd`/cmd_line/enum/Linux_64bit:`pwd`/cmd_line/bader/Linux_64bit:`pwd`/cmd_line/aconvasp/Linux_64bit:`pwd`/cmd_line/boltztrap/Linux_64bit:`pwd`/cmd_line/gulp/Linux_64bit
export GULP_LIB=`pwd`/cmd_line/gulp/Libraries
# ls
# echo "PATH=$PATH"
nosetests --config=nose.cfg --cover-html --cover-html-dir=coverage_reports
pmg structure --convert --filenames test_files/Li2O.cif POSCAR.pmg
pmg structure --convert --filenames POSCAR.pmg pmg.cif
Expand Down
8 changes: 0 additions & 8 deletions .circleci/images/py2/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion .circleci/images/py3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6.2
FROM python:3.6.4

RUN apt-get update && apt-get install -y gfortran python-openbabel python-vtk python3-tk
RUN curl -sSL https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \
Expand Down
2 changes: 1 addition & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def make_doc(ctx):
def update_doc(ctx):
make_doc(ctx)
ctx.run("git add .")
ctx.run("git commit -a -m \"Update dev docs\"")
ctx.run("git commit -a -m \"Update docs\"")
ctx.run("git push")


Expand Down

0 comments on commit bb2b41c

Please sign in to comment.