Sourcery Starbot ⭐ refactored kadykov/cupy-xarray #1

SourceryAI · 2023-02-23T16:34:29Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

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

git fetch https://github.com/sourcery-ai-bot/cupy-xarray main
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI · 2023-02-23T16:34:30Z

versioneer.py

-            print("Warning: build in %s is using versioneer.py from %s"
-                  % (os.path.dirname(my_path), versioneer_py))
+            print(
+                f"Warning: build in {os.path.dirname(my_path)} is using versioneer.py from {versioneer_py}"
+            )


Function get_root refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:31Z

versioneer.py

-                print("unable to run %s" % dispcmd)
+                print(f"unable to run {dispcmd}")
                print(e)
            return None, None
    else:
        if verbose:
-            print("unable to find command, tried %s" % (commands,))
+            print(f"unable to find command, tried {commands}")
        return None, None
    stdout = process.communicate()[0].strip().decode()
    if process.returncode != 0:
        if verbose:
-            print("unable to run %s (error)" % dispcmd)
-            print("stdout was %s" % stdout)
+            print(f"unable to run {dispcmd} (error)")
+            print(f"stdout was {stdout}")


Function run_command refactored with the following changes:

Replace interpolated string formatting with f-string [×4] (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:31Z

versioneer.py

-                    mo = re.search(r'=\s*"(.*)"', line)
-                    if mo:
-                        keywords["refnames"] = mo.group(1)
+                    if mo := re.search(r'=\s*"(.*)"', line):
+                        keywords["refnames"] = mo[1]
                if line.strip().startswith("git_full ="):
-                    mo = re.search(r'=\s*"(.*)"', line)
-                    if mo:
-                        keywords["full"] = mo.group(1)
+                    if mo := re.search(r'=\s*"(.*)"', line):
+                        keywords["full"] = mo[1]
                if line.strip().startswith("git_date ="):
-                    mo = re.search(r'=\s*"(.*)"', line)
-                    if mo:
-                        keywords["date"] = mo.group(1)
+                    if mo := re.search(r'=\s*"(.*)"', line):
+                        keywords["date"] = mo[1]


Function git_get_keywords refactored with the following changes:

Use named expression to simplify assignment and conditional [×3] (use-named-expression)

Replace m.group(x) with m[x] for re.Match objects [×3] (use-getitem-for-re-match-groups)

SourceryAI · 2023-02-23T16:34:31Z

versioneer.py

+            print(f"""discarding '{",".join(refs - tags)}', no digits""")
    if verbose:
-        print("likely tags: %s" % ",".join(sorted(tags)))
+        print(f'likely tags: {",".join(sorted(tags))}')


Function git_versions_from_keywords refactored with the following changes:

Replace interpolated string formatting with f-string [×3] (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:31Z

versioneer.py

-    GITS = ["git"]
-    if sys.platform == "win32":
-        GITS = ["git.cmd", "git.exe"]
-
+    GITS = ["git.cmd", "git.exe"] if sys.platform == "win32" else ["git"]


Function git_pieces_from_vcs refactored with the following changes:

Move setting of default value for variable into else branch (introduce-default-else)

Replace interpolated string formatting with f-string [×4] (replace-interpolation-with-fstring)

Merge dictionary assignment with declaration [×3] (merge-dict-assign)

Replace m.group(x) with m[x] for re.Match objects [×3] (use-getitem-for-re-match-groups)

Inline variable that is only used once (inline-variable)

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

This removes the following comments ( why? ):

# maybe improved later

SourceryAI · 2023-02-23T16:34:34Z

versioneer.py

-        raise ValueError("unknown style '%s'" % style)
+        raise ValueError(f"unknown style '{style}'")


Function render refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:34Z

versioneer.py

-    assert handlers, "unrecognized VCS '%s'" % cfg.VCS
+    assert handlers, f"unrecognized VCS '{cfg.VCS}'"


Function get_versions refactored with the following changes:

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

Replace interpolated string formatting with f-string [×5] (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:34Z

versioneer.py

+
+

Function get_cmdclass refactored with the following changes:

Replace interpolated string formatting with f-string [×10] (replace-interpolation-with-fstring)

This removes the following comments ( why? ):

# "version": versioneer.get_version().split("+", 1)[0], # FILEVERSION # as FILEVERSION, but it can be used for PRODUCTVERSION, e.g. # setup(console=[{ # nczeczulin reports that py2exe won't like the pep440-style string # "product_version": versioneer.get_version(), # ...

SourceryAI · 2023-02-23T16:34:34Z

versioneer.py

-    print(" creating %s" % cfg.versionfile_source)
+    print(f" creating {cfg.versionfile_source}")


Function do_setup refactored with the following changes:

Replace interpolated string formatting with f-string [×5] (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:35Z

versioneer.py

-        for line in f.readlines():
+        for line in f:


Function scan_setup_py refactored with the following changes:

Iterate over files directly rather than using readlines() (use-file-iterator)

SourceryAI · 2023-02-23T16:34:39Z

cupy_xarray/_version.py

    git_date = "$Format:%ci$"
-    keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
-    return keywords
+    return {"refnames": git_refnames, "full": git_full, "date": git_date}


Function get_keywords refactored with the following changes:

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

SourceryAI · 2023-02-23T16:34:39Z

cupy_xarray/_version.py

-                print("unable to run %s" % dispcmd)
+                print(f"unable to run {dispcmd}")
                print(e)
            return None, None
    else:
        if verbose:
-            print("unable to find command, tried %s" % (commands,))
+            print(f"unable to find command, tried {commands}")
        return None, None
    stdout = process.communicate()[0].strip().decode()
    if process.returncode != 0:
        if verbose:
-            print("unable to run %s (error)" % dispcmd)
-            print("stdout was %s" % stdout)
+            print(f"unable to run {dispcmd} (error)")
+            print(f"stdout was {stdout}")


Function run_command refactored with the following changes:

Replace interpolated string formatting with f-string [×4] (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:39Z

cupy_xarray/_version.py

-        print("Tried directories %s but none started with prefix %s" %
-              (str(rootdirs), parentdir_prefix))
+        print(
+            f"Tried directories {rootdirs} but none started with prefix {parentdir_prefix}"
+        )


Function versions_from_parentdir refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

Remove unnecessary calls to str() from formatted values in f-strings (remove-str-from-fstring)

SourceryAI · 2023-02-23T16:34:39Z

cupy_xarray/_version.py

-                    mo = re.search(r'=\s*"(.*)"', line)
-                    if mo:
-                        keywords["refnames"] = mo.group(1)
+                    if mo := re.search(r'=\s*"(.*)"', line):
+                        keywords["refnames"] = mo[1]
                if line.strip().startswith("git_full ="):
-                    mo = re.search(r'=\s*"(.*)"', line)
-                    if mo:
-                        keywords["full"] = mo.group(1)
+                    if mo := re.search(r'=\s*"(.*)"', line):
+                        keywords["full"] = mo[1]
                if line.strip().startswith("git_date ="):
-                    mo = re.search(r'=\s*"(.*)"', line)
-                    if mo:
-                        keywords["date"] = mo.group(1)
+                    if mo := re.search(r'=\s*"(.*)"', line):
+                        keywords["date"] = mo[1]


Function git_get_keywords refactored with the following changes:

Use named expression to simplify assignment and conditional [×3] (use-named-expression)

Replace m.group(x) with m[x] for re.Match objects [×3] (use-getitem-for-re-match-groups)

SourceryAI · 2023-02-23T16:34:39Z

cupy_xarray/_version.py

-            print("discarding '%s', no digits" % ",".join(refs - tags))
+            print(f"""discarding '{",".join(refs - tags)}', no digits""")
    if verbose:
-        print("likely tags: %s" % ",".join(sorted(tags)))
+        print(f'likely tags: {",".join(sorted(tags))}')


Function git_versions_from_keywords refactored with the following changes:

Replace interpolated string formatting with f-string [×3] (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:40Z

cupy_xarray/_version.py

-            rendered += "g%s" % pieces["short"]
-            if pieces["dirty"]:
-                rendered += ".dirty"
+            rendered += f'g{pieces["short"]}'
    else:
        # exception #1
        rendered = "0.post%d" % pieces["distance"]
        if pieces["branch"] != "master":
            rendered += ".dev0"
-        rendered += "+g%s" % pieces["short"]
-        if pieces["dirty"]:
-            rendered += ".dirty"
+        rendered += f'+g{pieces["short"]}'
+    if pieces["dirty"]:
+        rendered += ".dirty"


Function render_pep440_post_branch refactored with the following changes:

Split conditional into multiple branches [×2] (split-or-ifs)

Merge duplicate blocks in conditional [×2] (merge-duplicate-blocks)

Replace interpolated string formatting with f-string [×2] (replace-interpolation-with-fstring)

Hoist conditional out of nested conditional (hoist-if-from-if)

Hoist repeated code outside conditional statement (hoist-statement-from-if)

Remove redundant conditional [×2] (remove-redundant-if)

SourceryAI · 2023-02-23T16:34:41Z

cupy_xarray/_version.py

-            if pieces["dirty"]:
-                rendered += ".dev0"
    else:
        # exception #1
        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
+    if pieces["dirty"]:
+        rendered += ".dev0"


Function render_pep440_old refactored with the following changes:

Hoist conditional out of nested conditional (hoist-if-from-if)

Hoist repeated code outside conditional statement (hoist-statement-from-if)

SourceryAI · 2023-02-23T16:34:41Z

cupy_xarray/_version.py

-        raise ValueError("unknown style '%s'" % style)
+        raise ValueError(f"unknown style '{style}'")


Function render refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2023-02-23T16:34:41Z

cupy_xarray/accessors.py

    @property
    def is_cupy(self):
-        return all([da.cupy.is_cupy for da in self.ds.data_vars.values()])
+        return all(da.cupy.is_cupy for da in self.ds.data_vars.values())


Function CupyDatasetAccessor.is_cupy refactored with the following changes:

Replace unneeded comprehension with generator (comprehension-to-generator)

SourceryAI · 2023-02-23T16:34:41Z

cupy_xarray/accessors.py

-        if self.is_cupy:
-            data_vars = {var: da.cupy.as_numpy() for var, da in self.ds.data_vars.items()}
-            return Dataset(
-                data_vars=data_vars,
-                coords=self.ds.coords,
-                attrs=self.ds.attrs,
-            )
-        else:
+        if not self.is_cupy:
            return self.ds.as_numpy()
+        data_vars = {var: da.cupy.as_numpy() for var, da in self.ds.data_vars.items()}
+        return Dataset(
+            data_vars=data_vars,
+            coords=self.ds.coords,
+            attrs=self.ds.attrs,
+        )


Function CupyDatasetAccessor.as_numpy refactored with the following changes:

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

Remove unnecessary else after guard condition (remove-unnecessary-else)

'Refactored by Sourcery'

09bfc09

SourceryAI commented Feb 23, 2023

View reviewed changes

		raise ValueError("unknown style '%s'" % style)
		raise ValueError(f"unknown style '{style}'")

		assert handlers, "unrecognized VCS '%s'" % cfg.VCS
		assert handlers, f"unrecognized VCS '{cfg.VCS}'"

		print(" creating %s" % cfg.versionfile_source)
		print(f" creating {cfg.versionfile_source}")

Sourcery Starbot ⭐ refactored kadykov/cupy-xarray #1

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored kadykov/cupy-xarray #1

Uh oh!

Conversation

SourceryAI commented Feb 23, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant