Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin vcrpy to less than 1.7 #57

Merged
merged 3 commits into from
Oct 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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,)