ibridges-servers-uu 0.1.0__tar.gz → 0.3.0__tar.gz

{ibridges_servers_uu-0.1.0 → ibridges_servers_uu-0.3.0}/.github/workflows/python-package.yml

@@ -54,7 +54,7 @@ jobs:
     - name: Check if templates are listed
       run: |
         ibridges setup --list
-        test $(ibridges setup --list | wc -l) -eq 11
+        test $(ibridges setup --list | wc -l) -eq 12
 #    Uncomment the actions below depending on the linters and tests you want to do
 #    - name: Lint with flake8pip
 #      run: |

{ibridges_servers_uu-0.1.0/ibridges_servers_uu.egg-info → ibridges_servers_uu-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ibridges-servers-uu
-Version: 0.1.0
+Version: 0.3.0
 Summary: iRODS environments for connecting to Utrecht University YoDa servers
 Author-email: Raoul Schram <r.d.schram@uu.nl>
 License: MIT
@@ -17,6 +17,7 @@ Requires-Dist: ibridges
 Provides-Extra: test
 Requires-Dist: ruff; extra == "test"
 Requires-Dist: mypy; extra == "test"
+Dynamic: license-file
 
 # iRODS environments for Utrecht University YoDa servers
 
@@ -27,7 +28,7 @@ This repository can be used to create an iRODS environment json that is needed t
 Type the following on the command line (in your virtual environment if you use one):
 
 ```sh
-pip install git+https://github.com/UtrechtUniversity/ibridges-servers-uu.git
+pip install ibridges-servers-uu
 ```
 
 ## Step 2: Find the right server

{ibridges_servers_uu-0.1.0 → ibridges_servers_uu-0.3.0}/README.md

@@ -7,7 +7,7 @@ This repository can be used to create an iRODS environment json that is needed t
 Type the following on the command line (in your virtual environment if you use one):
 
 ```sh
-pip install git+https://github.com/UtrechtUniversity/ibridges-servers-uu.git
+pip install ibridges-servers-uu
 ```
 
 ## Step 2: Find the right server

{ibridges_servers_uu-0.1.0 → ibridges_servers_uu-0.3.0/ibridges_servers_uu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ibridges-servers-uu
-Version: 0.1.0
+Version: 0.3.0
 Summary: iRODS environments for connecting to Utrecht University YoDa servers
 Author-email: Raoul Schram <r.d.schram@uu.nl>
 License: MIT
@@ -17,6 +17,7 @@ Requires-Dist: ibridges
 Provides-Extra: test
 Requires-Dist: ruff; extra == "test"
 Requires-Dist: mypy; extra == "test"
+Dynamic: license-file
 
 # iRODS environments for Utrecht University YoDa servers
 
@@ -27,7 +28,7 @@ This repository can be used to create an iRODS environment json that is needed t
 Type the following on the command line (in your virtual environment if you use one):
 
 ```sh
-pip install git+https://github.com/UtrechtUniversity/ibridges-servers-uu.git
+pip install ibridges-servers-uu
 ```
 
 ## Step 2: Find the right server

{ibridges_servers_uu-0.1.0 → ibridges_servers_uu-0.3.0}/ibridgescontrib/uutemplate/templates.py

@@ -10,18 +10,19 @@ _SERVERS_TO_ZONE = {
     "uu-dgk": "nluu9ot",
     "uu-science": "nluu6p",
     "uu-fsw": "nluu10p",
-    "uu-its": "nluu12p"
+    "uu-its": "nluu12p",
+    "uu-surf": "uu",
 }
 
 
 _BASE_TEMPLATE = """{
-    "irods_host": "${host}.data.uu.nl",
+    "irods_host": "${host}.uu.nl",
     "irods_port": 1247,
     "irods_home": "/${zone}/home",
     "irods_user_name": "${email_address}",
     "irods_default_resource": "${resc}",
     "irods_zone_name": "${zone}",
-    "irods_authentication_scheme": "pam",
+    "irods_authentication_scheme": "${pam_scheme}",
     "irods_encryption_algorithm": "AES-256-CBC",
     "irods_encryption_key_size": 32,
     "irods_encryption_num_hash_rounds": 16,
@@ -44,7 +45,8 @@ class IBridgesUUTemplates:
         "uu-dgk": "Veterinary Medicine, Medicine",
         "uu-science": "Science",
         "uu-fsw": "Social and Behavioral Sciences",
-        "uu-its": "University Corporate Offices"
+        "uu-its": "University Corporate Offices",
+        "uu-surf": "Yoda instance hosted at SURF"
     }
 
     @staticmethod
@@ -60,9 +62,10 @@ class IBridgesUUTemplates:
     @staticmethod
     def environment_json(template_name: str, email_address: str) -> str:
         """Create a valid environment.json with the given inputs."""
-        host = template_name[3:]
+        host = template_name[3:]+".data" if template_name != "uu-surf" else "data.yoda"
         zone = _SERVERS_TO_ZONE[template_name]
         template = Template(_BASE_TEMPLATE)
+        pam_scheme = "pam_password" if template_name != "uu-surf" else "pam"
         resc = "irodsResc2" if template_name in ["uu-dgk", "uu-youth"] else "irodsResc"
         return template.substitute({"zone": zone, "email_address": email_address,
-                                    "host": host, "resc": resc})
+                                    "host": host, "resc": resc, "pam_scheme": pam_scheme})

{ibridges_servers_uu-0.1.0 → ibridges_servers_uu-0.3.0}/pyproject.toml

@@ -37,6 +37,7 @@ packages = ["ibridgescontrib"]
 write_to = "ibridgescontrib/uutemplate/_version.py"
 
 [tool.ruff]
+exclude = ["_version.py"]
 line-length = 100
 target-version = "py311"