Skip to content

Commit 02e7d6e

Browse files
committed
Make pyasn1 a compulsory package. cryptography, a dependency for PyOpenSSL>=0.14 needs it anyway so the optional install is superfluous.
1 parent d81c78b commit 02e7d6e

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ Releases
1010
========
1111
0.4.3
1212
-----
13-
* Minor fix for installation: set minimum release for ``pyasn1`` to avoid confl
14-
icts with Ubuntu install - see https://github.com/cedadev/ndg_httpsclient/issues/5 and https://github.com/cedadev/ndg_httpsclient/pull/10.
13+
* Minor fix for installation: set minimum release for ``pyasn1`` to avoid conflicts with Ubuntu
14+
install - see https://github.com/cedadev/ndg_httpsclient/issues/5 and
15+
https://github.com/cedadev/ndg_httpsclient/pull/10. ``pyasn1`` also becomes mandatory rather
16+
than optional package for install. - It required by ``cryptography`` anyway which is a
17+
dependency for ``pyOpenSSL`` from version 0.14.
1518

1619
0.4.2
1720
-----

setup.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
========
2121
0.4.3
2222
-----
23-
* Minor fix for installation: set minimum release for ``pyasn1`` to avoid conflicts with Ubuntu install - see https://github.com/cedadev/ndg_httpsclient/issues/5 and https://github.com/cedadev/ndg_httpsclient/pull/10.
23+
* Minor fix for installation: set minimum release for ``pyasn1`` to avoid conflicts with Ubuntu
24+
install - see https://github.com/cedadev/ndg_httpsclient/issues/5 and
25+
https://github.com/cedadev/ndg_httpsclient/pull/10. ``pyasn1`` also becomes mandatory rather
26+
than optional package for install. - It required by ``cryptography`` anyway which is a
27+
dependency for ``pyOpenSSL`` from version 0.14.
2428
2529
0.4.2
2630
-----
@@ -141,8 +145,7 @@
141145
'test/pki/ca/*.0'
142146
],
143147
},
144-
install_requires=['PyOpenSSL'],
145-
extras_require={'subjectAltName_support': 'pyasn1>=0.1.1'},
148+
install_requires=['PyOpenSSL', 'pyasn1>=0.1.1'],
146149
classifiers=[
147150
'Development Status :: 5 - Production/Stable',
148151
'Environment :: Console',

0 commit comments

Comments
 (0)