Drop singleton pattern

cloudview/instance.py

@@ -9,8 +9,6 @@
 from libcloud.compute.types import NodeState, LibcloudError
 from requests.exceptions import RequestException
 
-from cloudview.singleton import Singleton2
-
 STATES = [str(getattr(NodeState, _)) for _ in dir(NodeState) if _.isupper()]
 
 
@@ -31,7 +29,7 @@ class Instance:  # pylint: disable=too-many-instance-attributes
     extra: dict
 
 
-class CSP(metaclass=Singleton2):
+class CSP:
     """
     Cloud Service Provider class
     """

tests/test_azure.py

@@ -62,11 +62,6 @@ def test_get_creds_missing_env_vars():
     assert "subscription_id" not in creds
 
 
-@pytest.fixture(autouse=True)
-def reset_singleton(monkeypatch):
-    monkeypatch.setattr(Azure, "_singleton_instances", {})
-
-
 @pytest.fixture
 def valid_creds():
     return {

tests/test_ec2.py

@@ -62,11 +62,6 @@ def valid_creds():
     return {"key": "your_access_key", "secret": "your_secret_key"}
 
 
-@pytest.fixture(autouse=True)
-def reset_singleton(monkeypatch):
-    monkeypatch.setattr(EC2, "_singleton_instances", {})
-
-
 def test_list_instances_in_region(
     mock_ec2_driver, mock_ec2_instance, mocker, valid_creds
 ):

tests/test_gce.py

@@ -88,12 +88,6 @@ def test_get_creds_with_invalid_creds_file_and_env_var(
         assert creds is None
 
 
-# Fixture to reset the singleton instance before each test
-@pytest.fixture(autouse=True)
-def reset_singleton(monkeypatch):
-    monkeypatch.setattr(GCE, "_singleton_instances", {})
-
-
 @pytest.fixture
 def valid_creds():
     return {

tests/test_openstack.py

@@ -56,12 +56,6 @@ def test_get_creds_with_missing_auth_url(mock_openstack_env, monkeypatch):
     assert not creds
 
 
-# Fixture to reset the singleton instance before each test
-@pytest.fixture(autouse=True)
-def reset_singleton(monkeypatch):
-    monkeypatch.setattr(Openstack, "_singleton_instances", {})
-
-
 @pytest.fixture
 def valid_creds():
     return {