Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/loftytopping/PyBox
Browse files Browse the repository at this point in the history
Added merge in response to JOSS review
  • Loading branch information
loftytopping committed Aug 7, 2018
2 parents 1076910 + 41f9f81 commit 72c7819
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Docker_README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# To build a new image, run the following command in the directory of the supplied Dockerfile:
docker build -t pybox .
# Please note that when the build reaches the section on whether to install MS VSCode or not:
# 'Do you wish to proceed with the installation of Microsoft VSCode? [yes|no]', it can appear to hang. However this is seemingly a sympton # of the build process. Please do wait for completion.

# After this has completed [which may take some time], type the following to see your new image listed
docker images
Expand Down Expand Up @@ -31,4 +33,4 @@ exit
docker rm project_pybox
# To remove the image on which the container is based, which was built from our Dockerfile, type:
docker rmi pybox


2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ You can check if your Assimulo installation has worked by opening an interactive
- [UmanSysProp](http://umansysprop.seaes.manchester.ac.uk). Reliance on UManSysProp requires the Python interface to the [OpenBabel](https://openbabel.org/docs/dev/UseTheLibrary/Python_Pybel.html) package and uses [Flask WTF](https://flask-wtf.readthedocs.io/en/stable/) to deliver a web based facility. Both can be installed via the following commands:

> conda install openbabel
> conda install -c openbabel openbabel
> conda install -c anaconda flask-wtf
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ You can check if your Assimulo installation has worked by opening an interactive
- [UmanSysProp](http://umansysprop.seaes.manchester.ac.uk). Reliance on UManSysProp requires the Python interface to the [OpenBabel](https://openbabel.org/docs/dev/UseTheLibrary/Python_Pybel.html) package and uses [Flask WTF](https://flask-wtf.readthedocs.io/en/stable/) to deliver a web based facility. Both can be installed via the following commands:

> conda install openbabel
> conda install -c openbabel openbabel
> conda install -c anaconda flask-wtf
Expand Down

0 comments on commit 72c7819

Please sign in to comment.