Merge pull request Azure#378 from crwilcox/issue_376

crwilcox · crwilcox · commit 8674927bbea5 · 2015-06-03T12:00:23.000-07:00
Fixes Azure#376 by making pyopenssl optional
diff --git a/azure.pyproj b/azure.pyproj
@@ -104,6 +104,7 @@
     <Content Include="ChangeLog.txt" />
     <Content Include="LICENSE.txt" />
     <Content Include="README.rst" />
+    <Content Include="optional-requirements.txt" />
     <Content Include="requirements.txt" />
     <Content Include="tests\azurecredentials_sample.json" />
     <Content Include="tests\coverage.bat" />
diff --git a/azure/servicemanagement/__init__.py b/azure/servicemanagement/__init__.py
@@ -1994,7 +1994,11 @@ def get_certificate_from_publish_settings(publish_settings_path, path_to_write_c
         specific subscription under the publish settings file.
     '''
     import base64
-    import OpenSSL.crypto as crypto
+
+    try:
+        import OpenSSL.crypto as crypto
+    except:
+        raise Exception("pyopenssl is required to use get_certificate_from_publish_settings")
 
     _validate_not_none('publish_settings_path', publish_settings_path)
     _validate_not_none('path_to_write_certificate', path_to_write_certificate)
diff --git a/optional-requirements.txt b/optional-requirements.txt
@@ -0,0 +1 @@
+pyopenssl
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
 futures
 python-dateutil
-pyopenssl
 requests
diff --git a/setup.py b/setup.py
@@ -52,6 +52,8 @@
                 'azure.storage',
                 'azure.servicemanagement'],
       install_requires=['python-dateutil', 
-                        'pyopenssl',
-                        'futures']
-     )
+                        'futures'],
+      extras_require = { 
+          'get_certificate_from_publish_settings' : ['pyopenssl'] 
+      }
+)
