Skip to content

Commit

Permalink
update documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
agladstein committed Jun 25, 2018
1 parent b926389 commit d19c3cf
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 16 deletions.
29 changes: 15 additions & 14 deletions docs/source/develop.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
For Developers
##############

##############################
******************************
Install and Environment Set up
##############################
******************************


* Python 2.7.6, 2.7.11, or 2.7.13 is required to run the code, with the requirements installed from requirements.txt.
*Environments for Python 3 will soon be available*.
* We highly recommend running SimPrily with the provided Docker, Singularity, or virtual environment.

Container
*********
---------

**Docker**

Docker
------
A Docker Image built with Python 2.7.13, the requirements, and the SimPrily code can be found on Docker Hub
https://hub.docker.com/r/agladstein/simprily/

Expand All @@ -33,8 +34,8 @@ How to run SimPrily with the Docker container



Singularity
-----------
**Singularity**

The Docker image can be pulled as a Singularity container.

To pull the Singularity container:
Expand All @@ -50,16 +51,16 @@ How to run SimPrily with the Singularity container


Open Science Grid Connect
=========================
-------------------------

A prebuilt Singularity Image from the Docker Image is used for the Open Science Grid workflow.
The Singularity Image on OSG Connect is available from ``/cvmfs/singularity.opensciencegrid.org/agladstein/simprily\:latest``.

Virtual environment
*******************
-------------------

**Linux OS**

Linux OS
--------
cd to the directory you want to work in and then download the repository,
::

Expand All @@ -85,8 +86,8 @@ For quick help:

python simprily.py --help

Virtual Machine for non-Linux
-----------------------------
**Virtual Machine for non-Linux**


If you are running on a non-Linux OS, we recommend using the virtual machine, Vagrant (can be used on Mac or PC). In order to run Vagrant, you will also need VirtualBox.

Expand Down Expand Up @@ -125,7 +126,7 @@ For quick help:
python simprily.py --help

Local installation
******************
------------------
*We do not recommend this method*

cd to the directory you want to work in and then download the repository,
Expand Down
5 changes: 4 additions & 1 deletion docs/source/htc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,7 @@ It also defines how to handle output files.
Recommendations for other HTC workflows
***************************************

*coming soon*
*Coming soon!*

*In the meantime see this example of running SimPrily on an HPC cluster with PBS*
https://github.com/agladstein/ECOL-346-HPC-demo
2 changes: 1 addition & 1 deletion docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ or
singularity pull docker://agladstein/simprily


For more information see the developers documentation.
For more information see the `developers documentation <http://simprily.readthedocs.io/en/latest/develop.html>`_.

0 comments on commit d19c3cf

Please sign in to comment.