Changed readthedocs documentation

churchill-lab · Feb 15, 2016 · 1049016 · 1049016
1 parent d01c49c
commit 1049016
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION biopython>=1.63
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION biopython>=1.63 cython pysqlite>=2.6.3
   - source activate test-environment
   - conda install -c https://conda.binstar.org/bcbio pysam
   - conda install -c https://conda.binstar.org/bcbio bx-python

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,7 +3,7 @@
 History
 -------
 
-0.1.21 (02-15-2016)
+0.1.22 (02-15-2016)
 ~~~~~~~~~~~~~~~~~~~
 
 * Updated documetation

diff --git a/g2gtools/__init__.py b/g2gtools/__init__.py
@@ -14,7 +14,7 @@
 from .bins import bins
 
 
-__version__ = '0.1.21'
+__version__ = '0.1.22'
 __author__ = 'Matthew Vincent, The Jackson Laboratory'
 __email__ = 'matt.vincent@jax.org'
 

diff --git a/setup.py b/setup.py
@@ -61,7 +61,7 @@
     requirements.append('biopython>=1.63')
     requirements.append('pysqlite>=2.6.3')
 
-#import g2gtools
+import g2gtools
 
 
 def main():
@@ -73,7 +73,7 @@ def main():
 
     setup(
         name='g2gtools',
-        version='v0.1.20',
+        version=g2gtools.__version__,
         description="A set of tools that facilitates genome to genome conversion for studying multiparent populations",
         long_description=readme + '\n\n' + history,
         author='Kwangbom "KB" Choi & Matthew Vincent, The Jackson Laboratory',