Package renaming and fixes in the aftermath.

providers/acquantum/__init__.py → acquantum_qiskit/__init__.py

@@ -12,3 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+# noinspection PyUnresolvedReferences
+from .acquantumprovider import AcQuantumProvider
+# noinspection PyUnresolvedReferences
+from .credentials import AcQuantumCredentials

providers/acquantum/credentials/__init__.py → acquantum_qiskit/credentials/__init__.py

@@ -13,8 +13,8 @@
 #   limitations under the License.
 
 from acquantumconnector.credentials.credentials import AcQuantumCredentials
-from providers.acquantum.acquantumerrors import AcQuantumAccountError
-from providers.acquantum.credentials._env import read_credentials_from_environ
+from acquantum_qiskit.acquantumerrors import AcQuantumAccountError
+from acquantum_qiskit.credentials._env import read_credentials_from_environ
 
 
 def discover_credentials() -> AcQuantumCredentials:

providers/acquantum/credentials/_env.py → acquantum_qiskit/credentials/_env.py

@@ -15,7 +15,7 @@
 import os
 
 from acquantumconnector.credentials.credentials import AcQuantumCredentials
-from providers.acquantum.acquantumerrors import AcQuantumAccountError
+from acquantum_qiskit.acquantumerrors import AcQuantumAccountError
 
 VAR_MAP = {
     'ACQ_USER': 'user_name',

setup.py

@@ -14,7 +14,7 @@
 
 from setuptools import setup
 
-with open("providers/_version.py") as f:
+with open("acquantum_qiskit/_version.py") as f:
     version = f.readlines()[-1].split()[-1].strip("\"'")
 
 with open("README.rst", "r") as fh:
@@ -24,7 +24,7 @@
     requirements = f.readlines()
 
 info = {
-    'name': 'acquantum-qiskit',
+    'name': 'acquantum_qiskit-qiskit',
     'version': version,
     'author': 'Carsten Blank',
     'author_email': 'blank@data-cybernetics.com',
@@ -33,10 +33,9 @@
     'url': 'https://github.com/sebboer/acquantum_qiskit',
     'install_requires': requirements,
     'packages': [
-        'providers',
-        'providers.acquantum',
-        'providers.acquantum.credentials',
-        'providers.acquantum.models'
+        'acquantum_qiskit',
+        'acquantum_qiskit.credentials',
+        'acquantum_qiskit.models'
     ],
     'license': 'Apache 2.0',
 }

test/providers/acquantum/credentials/test_credentials.py → test/acquantum_qiskit/credentials/test_credentials.py

@@ -15,8 +15,8 @@
 import os
 from unittest import TestCase
 
-from providers.acquantum.acquantumerrors import AcQuantumAccountError
-from providers.acquantum.credentials import read_credentials_from_environ, discover_credentials
+from acquantum_qiskit.acquantumerrors import AcQuantumAccountError
+from acquantum_qiskit.credentials import read_credentials_from_environ, discover_credentials
 
 
 class TestCredentials(TestCase):

test/providers/acquantum/test_acQuantumBackend.py → test/acquantum_qiskit/test_acQuantumBackend.py

@@ -19,9 +19,9 @@
 from acquantumconnector.model.backendtype import AcQuantumBackendType
 from acquantumconnector.model.response import AcQuantumResult, AcQuantumResultResponse
 
-from providers.acquantum.acquantumbackend import AcQuantumBackend
-from providers.acquantum.backendconfiguration import AcQuantumBackendConfiguration
-from providers.acquantum.models import AcQuantumExperimentDetail
+from acquantum_qiskit.acquantumbackend import AcQuantumBackend
+from acquantum_qiskit.backendconfiguration import AcQuantumBackendConfiguration
+from acquantum_qiskit.models import AcQuantumExperimentDetail
 
 
 class TestAcQuantumBackend(TestCase):

test/providers/acquantum/test_acQuantumJob.py → test/acquantum_qiskit/test_acQuantumJob.py

@@ -19,10 +19,10 @@
 
 from acquantumconnector.model.backendtype import AcQuantumBackendType
 from acquantumconnector.model.response import AcQuantumResultResponse, AcQuantumResult
-from providers.acquantum.acquantumbackend import AcQuantumBackend
-from providers.acquantum.acquantumerrors import AcQuantumJobError
-from providers.acquantum.acquantumjob import AcQuantumJob, AcQuantumJobStatus
-from providers.acquantum.acquantumprovider import AcQuantumProvider
+from acquantum_qiskit.acquantumbackend import AcQuantumBackend
+from acquantum_qiskit.acquantumerrors import AcQuantumJobError
+from acquantum_qiskit.acquantumjob import AcQuantumJob, AcQuantumJobStatus
+from acquantum_qiskit.acquantumprovider import AcQuantumProvider
 
 
 class TestAcQuantumJob(TestCase):

test/providers/acquantum/test_acQuantumProvider.py → test/acquantum_qiskit/test_acQuantumProvider.py

@@ -15,8 +15,8 @@
 import os
 from unittest import TestCase, mock
 
-from providers.acquantum.acquantumerrors import AcQuantumBackendError
-from providers.acquantum.acquantumprovider import AcQuantumProvider
+from acquantum_qiskit.acquantumerrors import AcQuantumBackendError
+from acquantum_qiskit.acquantumprovider import AcQuantumProvider
 
 
 class SingleMock:
@@ -42,7 +42,7 @@ class TestAcQuantumProvider(TestCase):
     def setUp(self) -> None:
         super().setUp()
 
-    @mock.patch('providers.acquantum.acquantumprovider.AcQuantumSingleProvider', side_effect=SingleMock)
+    @mock.patch('acquantum_qiskit.acquantumprovider.AcQuantumSingleProvider', side_effect=SingleMock)
     def test_load_account(self, single_prov_mock):
         self.provider = AcQuantumProvider()
         self.provider.enable_account()
@@ -54,14 +54,14 @@ def test_load_account(self, single_prov_mock):
             raise AssertionError(msg)
         single_prov_mock.backends.assert_not_called()
 
-    @mock.patch('providers.acquantum.acquantumprovider.AcQuantumSingleProvider', side_effect=SingleMock)
+    @mock.patch('acquantum_qiskit.acquantumprovider.AcQuantumSingleProvider', side_effect=SingleMock)
     def test_get_backends(self, single_prov_mock):
         self.provider = AcQuantumProvider()
         self.provider.enable_account()
         backends = self.provider.backends()
         self.assertEqual(2, len(backends))
 
-    @mock.patch('providers.acquantum.acquantumprovider.AcQuantumSingleProvider', side_effect=SingleMock)
+    @mock.patch('acquantum_qiskit.acquantumprovider.AcQuantumSingleProvider', side_effect=SingleMock)
     def test_get_backends_without_loading_accounts(self, single_prov_mock):
         provider = AcQuantumProvider()
         with self.assertRaises(AcQuantumBackendError):

test/providers/acquantum/test_acQuantumSingleProvider.py → test/acquantum_qiskit/test_acQuantumSingleProvider.py

@@ -17,7 +17,7 @@
 from unittest.mock import Mock
 
 from acquantumconnector.credentials.credentials import AcQuantumCredentials
-from providers.acquantum.acquantumsingleprovider import AcQuantumSingleProvider
+from acquantum_qiskit.acquantumsingleprovider import AcQuantumSingleProvider
 
 backends_config = [
     {
@@ -68,17 +68,17 @@ def setUp(self) -> None:
         super().setUp()
         self._cred = AcQuantumCredentials(os.environ['ACQ_USER'], os.environ['ACQ_PWD'])
 
-    @mock.patch('providers.acquantum.acquantumsingleprovider.AcQuantumConnector.create_session')
-    @mock.patch('providers.acquantum.acquantumsingleprovider.AcQuantumConnector.available_backends',
+    @mock.patch('acquantum_qiskit.acquantumsingleprovider.AcQuantumConnector.create_session')
+    @mock.patch('acquantum_qiskit.acquantumsingleprovider.AcQuantumConnector.available_backends',
                 return_value=backends_config)
     def test_init(self, available_backends, create_session):
         provider = Mock()
         AcQuantumSingleProvider(self._cred, provider)
         create_session.assert_called_once_with(self._cred)
         available_backends.assert_called_once_with()
 
-    @mock.patch('providers.acquantum.acquantumsingleprovider.AcQuantumConnector.create_session')
-    @mock.patch('providers.acquantum.acquantumsingleprovider.AcQuantumConnector.available_backends',
+    @mock.patch('acquantum_qiskit.acquantumsingleprovider.AcQuantumConnector.create_session')
+    @mock.patch('acquantum_qiskit.acquantumsingleprovider.AcQuantumConnector.available_backends',
                 return_value=backends_config)
     def test_backends(self, available_backends, create_session):
         provider = Mock()