merge itis/master into master

Author: bisgaard-itis

clients/python/test/e2e/conftest.py

@@ -15,9 +15,15 @@
 import pytest
 from httpx import AsyncClient, BasicAuth
 from numpy import random
-from osparc._models import ConfigurationModel
+from packaging.version import Version
 from pydantic import ByteSize
 
+try:
+    from osparc._models import ConfigurationModel
+except ImportError:
+    pass
+
+
 _KB: ByteSize = ByteSize(1024)  # in bytes
 _MB: ByteSize = ByteSize(_KB * 1024)  # in bytes
 _GB: ByteSize = ByteSize(_MB * 1024)  # in bytes
@@ -96,12 +102,21 @@ def api_client() -> Iterable[osparc.ApiClient]:
 
 @pytest.fixture
 def async_client() -> Iterable[AsyncClient]:
-    configuration = ConfigurationModel()
+    if Version(osparc.__version__) >= Version("8.0.0"):
+        configuration = ConfigurationModel()
+        host = configuration.OSPARC_API_HOST.rstrip("/")
+        username = configuration.OSPARC_API_KEY
+        password = configuration.OSPARC_API_SECRET
+    else:
+        host = os.environ.get("OSPARC_API_HOST")
+        username = os.environ.get("OSPARC_API_KEY")
+        password = os.environ.get("OSPARC_API_SECRET")
+        assert host and username and password
     yield AsyncClient(
-        base_url=f"{configuration.OSPARC_API_HOST}".rstrip("/"),
+        base_url=host,
         auth=BasicAuth(
-            username=configuration.OSPARC_API_KEY,
-            password=configuration.OSPARC_API_SECRET,
+            username=username,
+            password=password,
         ),
     )  # type: ignore