Merge branch 'devel' into issue15

Author: philipkershaw

.pydevproject

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">ndg-httpsclient-py3</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/ndg_httpsclient</path>

README.md

@@ -8,6 +8,14 @@ of the SSL peer using ``pyasn1``.
 
 Releases
 ========
+0.4.3 (Candidate)
+-----
+ * 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.  ``pyasn1`` also becomes mandatory rather
+   than optional package for install.  - It required by ``cryptography`` anyway which is a 
+   dependency for ``pyOpenSSL`` from version 0.14.
+
 0.4.2
 -----
  * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call.  

setup.py

@@ -18,6 +18,14 @@
 
 Releases
 ========
+0.4.3 (Candidate)
+-----
+ * 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.  ``pyasn1`` also becomes mandatory rather
+   than optional package for install.  - It required by ``cryptography`` anyway which is a 
+   dependency for ``pyOpenSSL`` from version 0.14.
+
 0.4.2
 -----
  * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call.  
@@ -118,7 +126,7 @@
 
 setup(
     name='ndg_httpsclient',
-    version="0.4.2",
+    version="0.4.3",
     description='Provides enhanced HTTPS support for httplib and urllib2 using '
                 'PyOpenSSL',
     author='Richard Wilkinson and Philip Kershaw',
@@ -127,8 +135,6 @@
     long_description=_long_description,
     license='BSD - See ndg/httpsclient/LICENCE file for details',
     packages=find_packages(),
-#     namespace_packages=NAMESPACE_PKGS,
-#     package_dir={'ndg.httpsclient': 'ndg/httpsclient'},
     package_data={
         'ndg.httpsclient': [
             'LICENSE',
@@ -138,8 +144,7 @@
             'test/pki/ca/*.0'
             ],
     },
-    install_requires=['PyOpenSSL'],
-    extras_require={'subjectAltName_support': 'pyasn1'},
+    install_requires=['PyOpenSSL', 'pyasn1>=0.1.1'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',