Merge pull request #4 from jmenglund/develop

Simplify travis builds

Author: jmenglund

.travis.yml

@@ -9,14 +9,14 @@ branches:
     only:
         - master
 
-before_install:
-    - pip install codecov
-    - pip install pytest pytest-cov
-    - pip install biopython
-    - pip install dendropy
+#before_install:
+#    - pip install codecov
+#    - pip install pytest pytest-cov
+#    - pip install biopython
+#    - pip install dendropy
 
 script:
     py.test --cov=pandascharm.py
 
 after_success:
-  - codecov
+  - codecov

CHANGELOG.rst

@@ -6,8 +6,6 @@ Changelog
 
 Initial release.
 
-Released 2016-07-05
-
 Includes the following functions:
 
 * frame_as_categorical()
@@ -17,3 +15,15 @@ Includes the following functions:
 * to_bioalignment()
 * to_charmatrix()
 
+Release date: 2016-07-05
+
+
+0.1.1
+-----
+
+* Simplified builds with Travis-CI.
+* DOI badge added to the top of *README.rst*.
+* Information on how to cite pandas-charm added to *README.rst*.
+
+Release date: 2016-07-05
+

pandascharm.py

@@ -6,7 +6,7 @@
 
 __authors__ = 'Markus Englund'
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 
 
 def frame_as_categorical(frame, include_categories=None):

requirements.txt

@@ -1,4 +1,6 @@
 pandas>=0.16
 pytest>=2.8
+codecov
+pytest-cov
 DendroPy>=4.0
 BioPython

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='pandas-charm',
-    version='0.1.0',
+    version='0.1.1',
     description=(
         'A small Python library for getting character matrices '
         '(alignments) into and out of pandas'),
@@ -17,7 +17,8 @@
     packages=find_packages(exclude=['docs', 'tests*']),
     py_modules=['pandascharm'],
     install_requires=['pandas>=0.16', 'numpy'],
-    extras_require={'test': ['coverage', 'pytest', 'pytest-cov']},
+    extras_require={'testing': [
+        'coverage', 'pytest', 'pytest-cov', 'biopython', 'dendropy']},
     author='Markus Englund',
     author_email='[email protected]',
     url='https://github.com/jmenglund/pandas-charm',