Sourcery refactored master branch #2

sourcery-ai · 2023-10-02T04:25:43Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2023-10-02T04:25:45Z

setup.py

-    for l in f:
-        if not l.startswith("#"):
-            install_requires.append(l.split("#", 1)[0].strip())
-
+    install_requires.extend(
+        l.split("#", 1)[0].strip() for l in f if not l.startswith("#")
+    )


Lines 8-11 refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

sourcery-ai · 2023-10-02T04:25:45Z

deployer/cilogon_app.py

-    if id is None:
-        return url
-
-    return str(URL(url).with_query({"client_id": id}))
+    return url if id is None else str(URL(url).with_query({"client_id": id}))


Function build_request_url refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-10-02T04:25:45Z

deployer/cilogon_app.py

-    if cilogon_client_id != stored_client_id:
-        return False
-
-    return True
+    return cilogon_client_id == stored_client_id


Function stored_client_id_same_with_cilogon_records refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

Simplify boolean if expression (boolean-if-exp-identity)

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

sourcery-ai · 2023-10-02T04:25:45Z

deployer/cilogon_app.py

-        client_id = load_client_id_from_file(config_filename)
-        if client_id:
+        if client_id := load_client_id_from_file(config_filename):


Function create_client refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-10-02T04:25:46Z

deployer/cilogon_app.py

-    if not client_id:
-        if Path(config_filename).is_file():
-            client_id = load_client_id_from_file(config_filename)
-            # Nothing to do if no client has been found
-            if not client_id:
-                print_colour(
-                    "No `client_id` to delete was provided and couldn't find any in `config_filename`",
-                    "red",
-                )
-                return
-        else:
-            print_colour(
-                f"No `client_id` to delete was provided and couldn't find any {config_filename} file",
-                "red",
-            )
-            return
-    else:
+    if client_id:


Function delete_client refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

sourcery-ai · 2023-10-02T04:25:46Z

deployer/hub.py

-            self.cluster.config_path.joinpath(p)
-            for p in self.spec["helm_chart_values_files"]
-        ) as values_files:
+                self.cluster.config_path.joinpath(p)
+                for p in self.spec["helm_chart_values_files"]
+            ) as values_files:


Function Hub.deploy refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

sourcery-ai · 2023-10-02T04:25:47Z

deployer/utils.py

-    # A dictionary to convert row values when they are Boolean
-    boolean_converter = {
-        True: "Yes",
-        False: "No",
-    }
-


Function create_markdown_comment refactored with the following changes:

Move assignments closer to their usage (move-assign)

sourcery-ai · 2023-10-02T04:25:47Z

deployer/billing/importers.py

-    query = f"""
+    return f"""


Function build_gcp_query refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-10-02T04:25:47Z

deployer/billing/importers.py

-        rows = p.query_range(prom_query, start, end, step)
-        return rows
+        return p.query_range(prom_query, start, end, step)


Function PrometheusUtilizationImporter._run_query refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-10-02T04:25:47Z

deployer/billing/importers.py

-            df["support_combined"] = df["support_combined"] + df["support"]
+            df["support_combined"] += df["support"]


Function PrometheusUtilizationImporter.combine_support refactored with the following changes:

Replace assignment with augmented assignment (aug-assign)

sourcery-ai · 2023-10-02T04:25:49Z

deployer/billing/importers.py

-    result = bq_importer.get_costs(start_month, end_month)
-    return result
+    return bq_importer.get_costs(start_month, end_month)


Function get_dedicated_cluster_costs refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-10-02T04:25:49Z

deployer/generate/common.py

-        "username": "".join(secrets.choice(alphabet) for i in range(64)),
-        "password": "".join(secrets.choice(alphabet) for i in range(64)),
+        "username": "".join(secrets.choice(alphabet) for _ in range(64)),
+        "password": "".join(secrets.choice(alphabet) for _ in range(64)),


Function generate_support_files refactored with the following changes:

Replace unused for index with underscore [×2] (for-index-underscore)

sourcery-ai · 2023-10-02T04:25:49Z

deployer/grafana/central_grafana.py

-    datasource_details = {
+    return {


Function build_datasource_details refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-10-02T04:25:49Z

deployer/grafana/central_grafana.py

-    headers = {
+    return {
        "Accept": "application/json",
        "Content-Type": "application/json",
        "Authorization": f"Bearer {token}",
    }

-    return headers


Function build_datasource_request_headers refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-10-02T04:25:49Z

deployer/grafana/central_grafana.py

-                pass
-


Function update_central_grafana_datasources refactored with the following changes:

Remove redundant pass statement (remove-redundant-pass)

sourcery-ai · 2023-10-02T04:25:50Z

extra-scripts/comment-test-link-merged-pr.py

@@ -17,6 +17,7 @@
 Pull Request number, and the name of the *other* workflow that we want to provide
 a link to.
 """
+


Lines 56-92 refactored with the following changes:

Remove unnecessary call to keys() [×2] (remove-dict-keys)

sourcery-ai · 2023-10-02T04:25:50Z

extra-scripts/rsync-active-users.py

-        buf.append(escape_char)
-        buf.append("%X" % byte)
+        buf.extend((escape_char, "%X" % byte))


Function _escape_char refactored with the following changes:

Merge consecutive list appends into a single extend (merge-list-appends-into-extend)

sourcery-ai · 2023-10-02T04:25:50Z

extra-scripts/rsync-active-users.py

-    completed_futures = 0
-


Function main refactored with the following changes:

Move assignment closer to its usage within a block (move-assign-in-block)

Replace manual loop counter with call to enumerate (convert-to-enumerate)

sourcery-ai · 2023-10-02T04:25:50Z

tests/test_billing.py

-    c = yaml.load(test_cluster)
-    return c
+    return yaml.load(test_cluster)


Function cluster refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-10-02T04:25:51Z

tests/test_billing.py

-    schema = DataFrameSchema(
+    return DataFrameSchema(
        {
            "project": Column(String),
-            "total_with_credits": Column(Float, Check(lambda x: x > 0.0), coerce=True),
+            "total_with_credits": Column(
+                Float, Check(lambda x: x > 0.0), coerce=True
+            ),
        },
        index=Index(DateTime, name="month"),
    )
-    return schema


Function schema refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

'Refactored by Sourcery'

c4a22d8

sourcery-ai bot requested a review from luong-komorebi October 2, 2023 04:25

sourcery-ai bot commented Oct 2, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #2

Sourcery refactored master branch #2

sourcery-ai bot commented Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

sourcery-ai bot Oct 2, 2023

		df["support_combined"] = df["support_combined"] + df["support"]
		df["support_combined"] += df["support"]

Sourcery refactored master branch #2

Are you sure you want to change the base?

Sourcery refactored master branch #2

Conversation

sourcery-ai bot commented Oct 2, 2023

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Oct 2, 2023

Choose a reason for hiding this comment