standardization encoding="UTF-8"

Author: XaverStiensmeier

bibigrid/core/actions/create.py

@@ -264,7 +264,7 @@ def start_worker(self, worker, worker_count, configuration, provider):  # pylint
         # for DNS resolution an entry in the hosts file is created
         with self.worker_thread_lock:
             self.permanents.append(name)
-            with open(a_rp.HOSTS_FILE, mode="r", encoding="utf-8") as hosts_file:
+            with open(a_rp.HOSTS_FILE, mode="r", encoding="UTF-8") as hosts_file:
                 hosts = yaml.safe_load(hosts_file)
             if not hosts or "host_entries" not in hosts:
                 self.log.warning("Hosts file is broken.")

bibigrid/core/startup_rest.py

@@ -78,7 +78,7 @@ async def validation_exception_handler(request: Request, exc: RequestValidationE
 
 @app.get("/bibigrid/requirements", response_model=RequirementsModel)
 async def get_requirements():
-    with open(CLOUD_NODE_REQUIREMENTS_PATH, "r") as cloud_node_requirements_file:
+    with open(CLOUD_NODE_REQUIREMENTS_PATH, "r", encoding="UTF-8") as cloud_node_requirements_file:
         cloud_node_requirements = yaml.safe_load(cloud_node_requirements_file)
     return JSONResponse(content={"cloud_node_requirements": cloud_node_requirements}, status_code=200)
 
@@ -219,7 +219,7 @@ async def get_log(cluster_id: str, lines: int = None):
         file_name = os.path.join(LOG_FOLDER, f"{cluster_id}.log")
         if os.path.isfile(file_name):
             if not lines:
-                with open(file_name, "r", encoding="utf8") as log_file:
+                with open(file_name, "r", encoding="UTF-8") as log_file:
                     response = log_file.read()
             else:
                 response = tail(file_name, lines)

resources/playbook/roles/bibigrid/files/slurm/create_server.py

@@ -58,15 +58,15 @@ class ConfigurationException(Exception):
         worker_group_yaml_file = os.path.join(GROUP_VARS_PATH, filename)
         # checking if it is a file
         if os.path.isfile(worker_group_yaml_file):
-            with open(worker_group_yaml_file, mode="r", encoding="utf-8") as worker_group_yaml:
+            with open(worker_group_yaml_file, mode="r", encoding="UTF-8") as worker_group_yaml:
                 worker_groups.append(yaml.safe_load(worker_group_yaml))
 
 # read common configuration
-with open("/opt/playbook/vars/common_configuration.yaml", mode="r", encoding="utf-8") as common_configuration_file:
+with open("/opt/playbook/vars/common_configuration.yaml", mode="r", encoding="UTF-8") as common_configuration_file:
     common_config = yaml.safe_load(common_configuration_file)
 logging.info(f"Maximum 'is active' attempts: {common_config['cloud_scheduling']['sshTimeout']}")
 # read clouds.yaml
-with open("/etc/openstack/clouds.yaml", mode="r", encoding="utf-8") as clouds_file:
+with open("/etc/openstack/clouds.yaml", mode="r", encoding="UTF-8") as clouds_file:
     clouds = yaml.safe_load(clouds_file)["clouds"]
 
 connections = {}  # connections to cloud providers
@@ -107,7 +107,7 @@ def get_server_vars(name):
     server_vars = {"volumes": []}
     if os.path.isfile(host_vars_path):
         logging.info(f"Found host_vars file {host_vars_path}.")
-        with open(host_vars_path, mode="r", encoding="utf-8") as host_vars_file:
+        with open(host_vars_path, mode="r", encoding="UTF-8") as host_vars_file:
             server_vars = yaml.safe_load(host_vars_file)
             logging.info(f"Loaded Vars: {server_vars}")
     else:
@@ -171,7 +171,7 @@ def volumes_host_vars_update(connection, server, host_vars):
                 logging.debug(f"Added Configuration: Instance {server['name']} has volume {volume['name']} "
                               f"as device {volume['device']} that is going to be mounted to "
                               f"{volume.get('mountPoint')}")
-        with open(host_vars_path, mode="w+", encoding="utf-8") as host_vars_file:
+        with open(host_vars_path, mode="w+", encoding="UTF-8") as host_vars_file:
             yaml.dump(host_vars, host_vars_file)
     logging.info(f"{host_vars_path}.lock released")
 
@@ -219,7 +219,7 @@ def start_server(name, start_worker_group, start_data):
         userdata = ""
         userdata_file_path = f"/opt/slurm/userdata_{start_worker_group['cloud_identifier']}.txt"
         if os.path.isfile(userdata_file_path):
-            with open(userdata_file_path, mode="r", encoding="utf-8") as userdata_file:
+            with open(userdata_file_path, mode="r", encoding="UTF-8") as userdata_file:
                 userdata = userdata_file.read()
         # create server and ...
         image = select_image(start_worker_group, connection)
@@ -301,15 +301,15 @@ def update_hosts(name, ip):  # pylint: disable=invalid-name
     logging.info("Updating hosts.yaml")
     with FileLock("hosts.yaml.lock"):
         logging.info("Lock acquired")
-        with open(HOSTS_FILE_PATH, mode="r", encoding="utf-8") as hosts_file:
+        with open(HOSTS_FILE_PATH, mode="r", encoding="UTF-8") as hosts_file:
             hosts = yaml.safe_load(hosts_file)
         logging.info(f"Existing hosts {hosts}")
         if not hosts or "host_entries" not in hosts:
             logging.info(f"Resetting host entries because {'first run' if hosts else 'broken'}.")
             hosts = {"host_entries": {}}
         hosts["host_entries"][name] = ip
         logging.info(f"Added host {name} with ip {hosts['host_entries'][name]}")
-        with open(HOSTS_FILE_PATH, mode="w", encoding="utf-8") as hosts_file:
+        with open(HOSTS_FILE_PATH, mode="w", encoding="UTF-8") as hosts_file:
             yaml.dump(hosts, hosts_file)
     logging.info("Wrote hosts file. Released hosts.yaml.lock.")
 

resources/playbook/roles/bibigrid/files/slurm/delete_server.py

@@ -44,15 +44,15 @@
         f = os.path.join(GROUP_VARS_PATH, filename)
         # checking if it is a file
         if os.path.isfile(f):
-            with open(f, mode="r", encoding="utf-8") as worker_group:
+            with open(f, mode="r", encoding="UTF-8") as worker_group:
                 worker_groups.append(yaml.safe_load(worker_group))
 
 # read common configuration
-with open("/opt/playbook/vars/common_configuration.yaml", mode="r", encoding="utf-8") as common_configuration_file:
+with open("/opt/playbook/vars/common_configuration.yaml", mode="r", encoding="UTF-8") as common_configuration_file:
     common_config = yaml.safe_load(common_configuration_file)
 
 # read clouds.yaml
-with open("/etc/openstack/clouds.yaml", mode="r", encoding="utf-8") as clouds_file:
+with open("/etc/openstack/clouds.yaml", mode="r", encoding="UTF-8") as clouds_file:
     clouds = yaml.safe_load(clouds_file)["clouds"]
 
 connections = {}  # connections to cloud providers

resources/playbook/tools/tee.py

@@ -36,7 +36,7 @@ def reader(pipe, queue):
     Thread(target=reader, args=[p.stdout, q]).start()
     Thread(target=reader, args=[p.stderr, q]).start()
 
-    with open(args.outfile, "w", encoding="utf-8") as outfile:
+    with open(args.outfile, "w", encoding="UTF-8") as outfile:
         for line in iter(q.get, None):
             # print to stdout
             sys.stdout.write(line)

tests/integration/integration_test.py

@@ -32,7 +32,7 @@ def start_cluster():
 
 def read_cluster_info():
     """Read last cluster information from bibigrid.mem file."""
-    with open(MEM_FILE, "r", encoding="utf8") as f:
+    with open(MEM_FILE, "r", encoding="UTF-8") as f:
         cluster_data = yaml.safe_load(f)
     return cluster_data["cluster_id"], cluster_data["floating_ip"], cluster_data["ssh_user"]
 

tests/unit_tests/startup_tests.py

@@ -22,7 +22,7 @@ def suppress_stdout():
     Suppresses stdout within it
     @return:
     """
-    with open(os.devnull, "w", encoding="utf-8") as devnull:
+    with open(os.devnull, "w", encoding="UTF-8") as devnull:
         old_stdout = sys.stdout
         sys.stdout = devnull
         try:

tests/unit_tests/test_validate_schema.py

@@ -21,7 +21,7 @@ class TestValidateSchema(TestCase):
 
     def test_validate_configurations(self):
         for bibigrid_configuration_name in glob.iglob(f'{TEST_CONFIGURATION_DIRECTORY}/*.yaml'):
-            with open(bibigrid_configuration_name, mode="r", encoding="utf-8") as config_file:
+            with open(bibigrid_configuration_name, mode="r", encoding="UTF-8") as config_file:
                 config_yaml = yaml.safe_load(config_file)
                 for cloud_config in config_yaml:
                     cloud_config["cloud_identifier"] = "some"