Просмотр исходного кода

Merge pull request #226 from nuwang/dnssupport

Fixed incorrect package and some test issues
Nuwan Goonasekera 6 лет назад
Родитель
Сommit
18499cd246

+ 1 - 1
cloudbridge/base/helpers.py

@@ -10,7 +10,7 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization as crypt_serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 
-from deprecated import deprecated
+from deprecation import deprecated
 
 import six
 

+ 5 - 1
cloudbridge/providers/azure/provider.py

@@ -1,7 +1,7 @@
 import logging
 import uuid
 
-from deprecated import deprecated
+from deprecation import deprecated
 
 from msrestazure.azure_exceptions import CloudError
 
@@ -109,6 +109,10 @@ class AzureCloudProvider(BaseCloudProvider):
     def storage(self):
         return self._storage
 
+    @property
+    def dns(self):
+        raise NotImplementedError()
+
     @property
     def azure_client(self):
         if not self._azure_client:

+ 1 - 1
setup.py

@@ -23,7 +23,7 @@ REQS_BASE = [
     'six>=1.11',
     'tenacity>=4.12.0,<=5.0',
     'cachetools>=2.1.0',
-    'deprecated>=1.2.3',
+    'deprecation>=2.0.7',
     'pyeventsystem<2'
 ]
 REQS_AWS = [

+ 0 - 4
tests/helpers/standard_interface_tests.py

@@ -147,10 +147,6 @@ def check_obj_id(test, obj):
     id_property = getattr(type(obj), 'id', None)
     test.assertIsInstance(id_property, property)
     test.assertIsNone(id_property.fset, "Id should not have a setter")
-    # Some delimiter characters can trip up djcloudbridge url reversing
-    # so make sure ids do not contain them
-    test.assertTrue("/" not in obj.id,
-                    "IDs should not contain slash but is: %s" % (obj.id,))
 
 
 def check_obj_name(test, obj):