NGPIris 5.1.0__tar.gz → 5.1.1.dev2__tar.gz

{ngpiris-5.1.0 → ngpiris-5.1.1.dev2}/NGPIris/hcp/hcp.py

@@ -62,10 +62,15 @@ class HCPHandler:
         credentials_handler = CredentialsHandler(credentials_path)
         self.hcp = credentials_handler.hcp
         self.endpoint = "https://" + self.hcp["endpoint"]
-        tenant_parse = parse("https://{}.hcp1.vgregion.se", self.endpoint)
-        if type(tenant_parse) is Result:
-            self.tenant = str(tenant_parse[0])
-        else: # pragma: no cover
+
+        self.tenant = None
+        for endpoint_format_string in ["https://{}.ngp-fs1000.vgregion.se", "https://{}.ngp-fs2000.vgregion.se", "https://{}.ngp-fs3000.vgregion.se", "https://{}.vgregion.sjunet.org"]:
+            tenant_parse = parse(endpoint_format_string, self.endpoint) 
+            if type(tenant_parse) is Result:
+                self.tenant = str(tenant_parse[0])
+                break
+        
+        if not self.tenant:
             raise RuntimeError("Unable to parse endpoint. Make sure that you have entered the correct endpoint in your credentials JSON file. Hint: The endpoint should *not* contain \"https://\" or port numbers")
         self.base_request_url = self.endpoint + ":9090/mapi/tenants/" + self.tenant
         self.aws_access_key_id = self.hcp["aws_access_key_id"]

{ngpiris-5.1.0 → ngpiris-5.1.1.dev2}/NGPIris.egg-info/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: NGPIris
-Version: 5.1.0
+Version: 5.1.1.dev2
 Author-email: Erik Brink <erik.brink@gu.se>, Isak Sylvin <isak.sylvin@gu.se>
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.31.0
 Requires-Dist: urllib3==1.26.19
-Requires-Dist: requests>=2.31.0
 Requires-Dist: boto3>=1.26.76
 Requires-Dist: parse>=1.19.1
 Requires-Dist: tqdm>=4.66.2

{ngpiris-5.1.0 → ngpiris-5.1.1.dev2}/NGPIris.egg-info/requires.txt

@@ -1,6 +1,5 @@
 requests>=2.31.0
 urllib3==1.26.19
-requests>=2.31.0
 boto3>=1.26.76
 parse>=1.19.1
 tqdm>=4.66.2

{ngpiris-5.1.0 → ngpiris-5.1.1.dev2}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: NGPIris
-Version: 5.1.0
+Version: 5.1.1.dev2
 Author-email: Erik Brink <erik.brink@gu.se>, Isak Sylvin <isak.sylvin@gu.se>
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.31.0
 Requires-Dist: urllib3==1.26.19
-Requires-Dist: requests>=2.31.0
 Requires-Dist: boto3>=1.26.76
 Requires-Dist: parse>=1.19.1
 Requires-Dist: tqdm>=4.66.2

{ngpiris-5.1.0 → ngpiris-5.1.1.dev2}/pyproject.toml

@@ -1,11 +1,10 @@
 [project]
 name = "NGPIris"
-version = "5.1.0"
+version = "5.1.1.dev2"
 readme = "README.md"
 dependencies = [
     "requests >= 2.31.0",
     "urllib3 == 1.26.19",
-    "requests >= 2.31.0",
     "boto3 >= 1.26.76",
     "parse >= 1.19.1",
     "tqdm >= 4.66.2",