[RFR] Update pre-commit hooks rev (#10029)

* Update pre-commit hooks rev

* some pyupgrade changes

Author: digitronik

.pre-commit-config.yaml

@@ -5,18 +5,18 @@ substitutions:
     exclude: ^(cfme|scripts) # for now disable - we shall gradually reenable it
 repos:
 - repo: https://github.com/asottile/reorder_python_imports
-  rev: v1.6.1
+  rev: v2.1.0
   hooks:
   - id: reorder-python-imports
 - repo: https://github.com/ambv/black
-  rev: 19.3b0
+  rev: 19.10b0
   hooks:
   - id: black
     args: [--safe, --line-length, '100']
     language_version: python3.7
     <<: *exclude
 - repo: https://github.com/asottile/pyupgrade
-  rev: v1.23.0
+  rev: v2.1.0
   hooks:
   - id: pyupgrade
     language_version: python3.7
@@ -28,7 +28,7 @@ repos:
     language_version: python3.7
     additional_dependencies: [polarion-docstrings, bugzilla-docstrings]
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
+  rev: v2.5.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer

artifactor/__init__.py

@@ -159,7 +159,7 @@ def parse_config(self):
         if not self.artifact_dir:
             print("!!! Artifact dir must be specified in yaml")
             sys.exit(127)
-        self.config["zmq_socket_address"] = "tcp://127.0.0.1:{}".format(random_port())
+        self.config["zmq_socket_address"] = f"tcp://127.0.0.1:{random_port()}"
         self.setup_plugin_instances()
         self.start_server()
         self.global_data = {

artifactor/plugins/reporter.py

@@ -169,15 +169,15 @@ def process_data(self, artifacts, log_dir, version, fw_version, name_filter=None
                 group_file_list = []
                 for file_dict in file_dicts:
                     if file_dict["file_type"] == "qa_contact":
-                        with open(file_dict["os_filename"], "r") as qafile:
+                        with open(file_dict["os_filename"]) as qafile:
                             qareader = csv.reader(qafile, delimiter=",", quotechar='"')
                             for qacontact in qareader:
                                 test_data["qa_contact"].append(qacontact)
                                 if qacontact[0] not in template_data["qa"]:
                                     template_data["qa"].append(qacontact[0])
                         continue  # Do not store, handled a different way :)
                     elif file_dict["file_type"] == "short_tb":
-                        with open(file_dict["os_filename"], "r") as short_tb:
+                        with open(file_dict["os_filename"]) as short_tb:
                             test_data["short_tb"] = short_tb.read()
                         continue
                     file_dict["filename"] = file_dict["os_filename"].replace(log_dir, "")

cfme/fixtures/candu.py

@@ -73,7 +73,7 @@ def candu_db_restore(temp_appliance_extended_db):
     # get DB backup file
     db_storage_hostname = conf.cfme_data.bottlenecks.hostname
     db_storage_ssh = SSHClient(hostname=db_storage_hostname, **conf.credentials.bottlenecks)
-    rand_filename = "/tmp/db.backup_{}".format(fauxfactory.gen_alphanumeric())
+    rand_filename = f"/tmp/db.backup_{fauxfactory.gen_alphanumeric()}"
     db_storage_ssh.get_file("{}/candu.db.backup".format(
         conf.cfme_data.bottlenecks.backup_path), rand_filename)
     app.ssh_client.put_file(rand_filename, "/tmp/evm_db.backup")

cfme/fixtures/depot.py

@@ -63,7 +63,7 @@ def depot_machine_ipv4_and_ipv6(request, appliance):
         data = cfme_data.log_db_operations
         vm = deploy_template(
             data.log_db_depot_template.provider,
-            "long-test-depot-{}".format(fauxfactory.gen_alphanumeric()),
+            f"long-test-depot-{fauxfactory.gen_alphanumeric()}",
             template_name=data.log_db_depot_template.template_name
         )
         vm.ensure_state(VmState.RUNNING)

cfme/fixtures/service_fixtures.py

@@ -251,7 +251,7 @@ def import_dialog(appliance, file_name):
     import_export.import_dialog(file_path)
 
     # Read yml to get the field name
-    with open(file_path, "r") as stream:
+    with open(file_path) as stream:
         dialog = yaml.load(stream, Loader=yaml.BaseLoader)
         # It returns list of dicts
         description = dialog[0].get("description")

cfme/fixtures/xunit_tools.py

@@ -1,6 +1,6 @@
 # pylint: disable=broad-except
-import datetime
 import re
+from datetime import datetime
 
 import pytest
 from lxml import etree
@@ -29,7 +29,8 @@
 compiled_blacklist = re.compile('(' + ')|('.join(blacklist) + ')')
 
 
-timestamp = '{:%Y%m%d%H%M%S}'.format(datetime.datetime.now())
+now = datetime.now()
+timestamp = now.strftime("%Y%m%d%H%M%S")
 
 
 default_custom_fields = {

cfme/scripting/bz.py

@@ -58,7 +58,7 @@ def get_report(directory):
     ])
     # read the generated yaml
     try:
-        with open("bz-report.yaml", "r") as stream:
+        with open("bz-report.yaml") as stream:
             info = yaml.load(stream, Loader=yaml.BaseLoader)
     except OSError:
         msg = (

cfme/scripting/ipyshell.py

@@ -25,9 +25,9 @@ def main(no_quickstart):
     from cfme.utils.path import conf_path
     custom_import_path = conf_path.join('miq_python_startup.py')
     if custom_import_path.exists():
-        with open(custom_import_path.strpath, 'r') as custom_import_file:
+        with open(custom_import_path.strpath) as custom_import_file:
             custom_import_code = custom_import_file.read()
-        print('Importing custom code:\n{}'.format(custom_import_code.strip()))
+        print(f'Importing custom code:\n{custom_import_code.strip()}')
         ipython.run_cell(custom_import_code)
     else:
         print(

cfme/scripting/polarion.py

@@ -84,7 +84,7 @@ def populate(
     polarion_url,
     template_format,
 ):
-    with open(template, 'r') as template_file:
+    with open(template) as template_file:
         input_yaml, indent, block_indent = load_yaml_guess_indent(template_file)
 
     # first update credentials fields