Skip to content

Commit

Permalink
Set optional dependency pyasn1 version >=0.1.1
Browse files Browse the repository at this point in the history
ndg_httpsclient is incompatible with pyasn1 0.0.11a0,
which is shipped with Ubuntu precise.

The next version of pyasn1 0.0.13 is not compatible
with Python 3, so require the next version 0.1.1

Also use a list for the extra dependency.
  • Loading branch information
jayvdb committed Jun 7, 2016
1 parent 7c51cb7 commit 8b0c0a6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,11 @@ python:
- 3.5
- nightly
script:
- python setup.py install
- pip install --upgrade pip
- |
if [[ ${TRAVIS_PYTHON_VERSION:0:1} == '2' ]]; then
pip install pyasn1==0.0.11a0
fi
- pip install -e '.[subjectAltName_support]'
- (cd /tmp && pip uninstall --yes ndg_httpsclient)
- python setup.py install
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
],
},
install_requires = ['PyOpenSSL'],
extras_require = {'subjectAltName_support': 'pyasn1'},
extras_require = {'subjectAltName_support': ['pyasn1>=0.1.1']},
classifiers = [
'Development Status :: 3 - Alpha',
'Environment :: Console',
Expand Down

0 comments on commit 8b0c0a6

Please sign in to comment.