Skip to content

Commit 8b0c0a6

Browse files
committed
Set optional dependency pyasn1 version >=0.1.1
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.
1 parent 7c51cb7 commit 8b0c0a6

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,11 @@ python:
77
- 3.5
88
- nightly
99
script:
10-
- python setup.py install
10+
- pip install --upgrade pip
11+
- |
12+
if [[ ${TRAVIS_PYTHON_VERSION:0:1} == '2' ]]; then
13+
pip install pyasn1==0.0.11a0
14+
fi
1115
- pip install -e '.[subjectAltName_support]'
16+
- (cd /tmp && pip uninstall --yes ndg_httpsclient)
17+
- python setup.py install

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
],
123123
},
124124
install_requires = ['PyOpenSSL'],
125-
extras_require = {'subjectAltName_support': 'pyasn1'},
125+
extras_require = {'subjectAltName_support': ['pyasn1>=0.1.1']},
126126
classifiers = [
127127
'Development Status :: 3 - Alpha',
128128
'Environment :: Console',

0 commit comments

Comments
 (0)