Merge pull request #57 from dopplershift/fix_vcrpy

Update testing.

.travis.yml

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

README.rst

@@ -57,7 +57,7 @@ Siphon is still in an early stage of development, and as such
 just for fun, many things may still change as we work through
 design issues.
 
-We support Python 2.7 as well as Python >= 3.2.
+We support Python 2.7 as well as Python >= 3.3.
 
 Installation
 ------------

setup.py

@@ -61,9 +61,9 @@ def run(self):
                  'Programming Language :: Python :: 2',
                  'Programming Language :: Python :: 2.7',
                  'Programming Language :: Python :: 3',
-                 'Programming Language :: Python :: 3.2',
                  'Programming Language :: Python :: 3.3',
                  'Programming Language :: Python :: 3.4',
+                 'Programming Language :: Python :: 3.5',
                  'Topic :: Scientific/Engineering',
                  'Intended Audience :: Science/Research',
                  'Operating System :: OS Independent',
@@ -74,7 +74,7 @@ def run(self):
     extras_require={
         'dev': ['ipython[all]>=3.1'],
         'doc': ['sphinx>=1.3', 'ipython[all]>=3.1'],
-        'test': ['nosetest', 'vcrpy>=1.5']
+        'test': ['nosetest', 'vcrpy>=1.5,<1.7']
     },
 
     download_url='https://github.com/Unidata/siphon/archive/v%s.tar.gz' % ver,)