Merge pull request #61 from dopplershift/infra-updates

Infrastructure updates

.travis.yml

@@ -13,21 +13,21 @@ addons:
 
 matrix:
   include:
+    - python: 3.5
+      env: NOSE_WITH_COVERAGE=y NOSE_COVER_PACKAGE=siphon
+    - python: 3.5
+      env: EXAMPLES=true
+    - python: 3.5
+      env: LINT=true
     - python: 2.7
     - python: 2.7
-      env: LINT=true
+      env: EXAMPLES=true
     - python: 2.7
       env: DOCBUILD=true
     - python: 2.7
-      env: EXAMPLES=true
+      env: LINT=true
     - python: 3.3
     - python: 3.4
-    - python: 3.5
-      env: NOSE_WITH_COVERAGE=y NOSE_COVER_PACKAGE=siphon
-    - python: 3.5
-      env: LINT=true
-    - python: 3.5
-      env: EXAMPLES=true
 
 before_install:
   - if [[ $LINT == true ]]; then
@@ -40,7 +40,7 @@ before_install:
         fi;
         pip install -r docs/requirements.txt;
       else
-        pip install "vcrpy<1.7";
+        pip install "vcrpy>=1.7.4";
         pip install nose;
         if [[ $NOSE_WITH_COVERAGE == y ]]; then
           pip install coverage;

setup.cfg

@@ -8,3 +8,11 @@ description-file = README.rst
 [bdist_wheel]
 # This flag says that the code is written to work on both Python 2 and 3.
 universal=1
+
+[versioneer]
+VCS = git
+style = pep440
+versionfile_source = siphon/_version.py
+versionfile_build = siphon/_version.py
+tag_prefix = v
+parentdir_prefix = siphon-

setup.py

@@ -1,11 +1,6 @@
 from __future__ import print_function
 from setuptools import setup, find_packages, Command
 import versioneer
-versioneer.VCS = 'git'
-versioneer.versionfile_source = 'siphon/_version.py'
-versioneer.versionfile_build = 'siphon/_version.py'
-versioneer.tag_prefix = 'v'
-versioneer.parentdir_prefix = 'siphon-'
 
 
 class MakeExamples(Command):
@@ -74,7 +69,7 @@ def run(self):
     extras_require={
         'dev': ['ipython[all]>=3.1'],
         'doc': ['sphinx>=1.3', 'ipython[all]>=3.1'],
-        'test': ['nosetest', 'vcrpy>=1.5,<1.7']
+        'test': ['nosetest', 'vcrpy~=1.5,!=1.7.0,!=1.7.1,!=1.7.2,!=1.7.3']
     },
 
     download_url='https://github.com/Unidata/siphon/archive/v%s.tar.gz' % ver,)