Skip to content

Commit

Permalink
updated environment info
Browse files Browse the repository at this point in the history
  • Loading branch information
oena committed Jan 11, 2018
1 parent d3a3690 commit 31ed121
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
15 changes: 2 additions & 13 deletions docs/source/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,12 @@ We highly recommend the using a prebuilt distribution of cmapPy along with a vi

* (Mac) Create & activate your cmapPy environment:

Note. We currently use Python 2.7.11 for our production code (hence its specification); however, other versions of Python should be stable as well. Depending on whether you use Python 2 or Python 3:
Note. We currently use Python 2.7.11 for our production code (hence its specification); however, other versions of Python 2 should be stable as well. We do not currently support Python 3.

**Step 1**

Python 2: ``conda create --name my_cmapPy_env python=2.7.11 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six cmappy``

Python 3.5: ``conda create --name my_cmapPy_env python=3.5 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six cmappy``

Python 3.6: ``conda create --name my_cmapPy_env python=3.6 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six cmappy``

**Step 2**

Expand All @@ -39,10 +36,6 @@ We highly recommend the using a prebuilt distribution of cmapPy along with a vi

Python 2: ``conda create --name my_cmapPy_env python=2.7.11 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six``

Python 3.5: ``conda create --name my_cmapPy_env python=3.5 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six cmappy``

Python 3.6: ``conda create --name my_cmapPy_env python=3.6 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six cmappy``

**Step 2**

``pip install cmapPy``
Expand All @@ -64,12 +57,8 @@ A development environment will allow you to use the cmapPy code as it is in a cl

Follow the instructions for Option 1 or Option 2 above but change the name of the environment to e.g. ``my_cmapPy_dev_env`` and do not include ``cmappy`` in the list of packages to install (or do not install it with pip), then activate this environment, i.e.:

Python 2.7: ``conda create --name my_cmapPy_dev_env python=2.7.11 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0``
Python 2.7: ``conda create --name my_cmapPy_dev_env python=2.7.11 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six``

Python 3.5: ``conda create --name my_cmapPy_env python=3.5 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six``

Python 3.6: ``conda create --name my_cmapPy_env python=3.6 numpy=1.11.2 pandas=0.20.3 h5py=2.7.0 requests==2.13.0 six``

``source activate my_cmapPy_dev_env``

Clone the cmapPy github repository, cd into the repo's top-level directory, and run:
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
# built documents.
#
# The short X.Y version.
version = u'2.2'
version = u'3.0'
# The full version, including alpha/beta/rc tags.
release = u'2.2.0'
release = u'3.0.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 31ed121

Please sign in to comment.