Skip to content

Commit 31ed121

Browse files
committed
updated environment info
1 parent d3a3690 commit 31ed121

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

docs/source/build.rst

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,12 @@ We highly recommend the using a prebuilt distribution of cmapPy along with a vi
1919

2020
* (Mac) Create & activate your cmapPy environment:
2121

22-
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:
22+
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.
2323

2424
**Step 1**
2525

2626
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``
2727

28-
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``
29-
30-
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``
3128

3229
**Step 2**
3330

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

4037
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``
4138

42-
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``
43-
44-
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``
45-
4639
**Step 2**
4740

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

6558
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.:
6659

67-
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``
60+
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``
6861

69-
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``
70-
71-
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``
72-
7362
``source activate my_cmapPy_dev_env``
7463

7564
Clone the cmapPy github repository, cd into the repo's top-level directory, and run:

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
# built documents.
6565
#
6666
# The short X.Y version.
67-
version = u'2.2'
67+
version = u'3.0'
6868
# The full version, including alpha/beta/rc tags.
69-
release = u'2.2.0'
69+
release = u'3.0.0'
7070

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

0 commit comments

Comments
 (0)