Skip to content

Commit d81c78b

Browse files
committed
Setting minimum version for pyasn1 to address conflicts with Ubuntu install (#5).
1 parent e73dc05 commit d81c78b

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.pydevproject

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?eclipse-pydev version="1.0"?><pydev_project>
3-
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
3+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">ndg-httpsclient-py3</pydev_property>
44
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
55
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
66
<path>/ndg_httpsclient</path>

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ of the SSL peer using ``pyasn1``.
88

99
Releases
1010
========
11+
0.4.3
12+
-----
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.
15+
1116
0.4.2
1217
-----
1318
* Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call.

setup.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
1919
Releases
2020
========
21+
0.4.3
22+
-----
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.
24+
2125
0.4.2
2226
-----
2327
* Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call.
@@ -118,7 +122,7 @@
118122

119123
setup(
120124
name='ndg_httpsclient',
121-
version="0.4.2",
125+
version="0.4.3",
122126
description='Provides enhanced HTTPS support for httplib and urllib2 using '
123127
'PyOpenSSL',
124128
author='Richard Wilkinson and Philip Kershaw',
@@ -128,7 +132,6 @@
128132
license='BSD - See ndg/httpsclient/LICENCE file for details',
129133
packages=find_packages(),
130134
namespace_packages=NAMESPACE_PKGS,
131-
# package_dir={'ndg.httpsclient': 'ndg/httpsclient'},
132135
package_data={
133136
'ndg.httpsclient': [
134137
'LICENSE',
@@ -139,7 +142,7 @@
139142
],
140143
},
141144
install_requires=['PyOpenSSL'],
142-
extras_require={'subjectAltName_support': 'pyasn1'},
145+
extras_require={'subjectAltName_support': 'pyasn1>=0.1.1'},
143146
classifiers=[
144147
'Development Status :: 5 - Production/Stable',
145148
'Environment :: Console',

0 commit comments

Comments
 (0)