From 659863a2cdf8f460051820e8e78325e072129e6a Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 20 Feb 2023 20:32:29 +0100 Subject: [PATCH 1/2] update config --- .pre-commit-config.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 764e046..91eb207 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,12 +22,12 @@ repos: - id: check-docstring-first - id: detect-private-key - #- repo: https://github.com/asottile/pyupgrade - # rev: v2.23.1 - # hooks: - # - id: pyupgrade - # args: [--py36-plus] - # name: Upgrade code + - repo: https://github.com/asottile/pyupgrade + rev: v3.3.1 + hooks: + - id: pyupgrade + args: [--py38-plus] + name: Upgrade code - repo: https://github.com/asottile/yesqa rev: v1.4.0 @@ -35,13 +35,13 @@ repos: - id: yesqa - repo: https://github.com/psf/black - rev: 22.12.0 + rev: 23.1.0 hooks: - id: black name: Format code - repo: https://github.com/PyCQA/isort - rev: 5.11.4 + rev: 5.12.0 hooks: - id: isort name: imports From 78b7640b91dd896accd0e58664ad6f28e1fd6111 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 20 Feb 2023 20:32:52 +0100 Subject: [PATCH 2/2] apply --- docs/source/conf.py | 23 +++++------ rising/_version.py | 18 ++++----- rising/interface.py | 2 +- rising/loading/loader.py | 8 ++-- rising/transforms/functional/intensity.py | 3 +- rising/transforms/functional/painting.py | 5 +-- rising/transforms/kernel.py | 8 ++-- tests/loading/test_collate.py | 2 +- tests/loading/test_loader.py | 2 +- tests/test_interface.py | 4 +- versioneer.py | 49 +++++++++++------------ 11 files changed, 59 insertions(+), 65 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 7c82059..fcfe9ff 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Configuration file for the Sphinx documentation builder. # @@ -298,7 +297,7 @@ nbsphinx_kernel_name = "python3" -github_path = r"https://github.com/%s/%s/blob/master/notebooks/{{ env.doc2path(env.docname, base=None) }}" % ( +github_path = r"https://github.com/{}/{}/blob/master/notebooks/{{{{ env.doc2path(env.docname, base=None) }}}}".format( github_user, github_repo, ) @@ -321,21 +320,21 @@ .. raw:: html
- + - + - + - """ % ( + """.format( colab_path, r"{{ env.doc2path(env.docname, base=None) }}", github_path, @@ -356,14 +355,14 @@ .. raw:: html
- + - +
- """ % ( + """.format( colab_path, github_path, ) @@ -389,14 +388,14 @@ # https://stackoverflow.com/questions/15889621/sphinx-how-to-exclude-imports-in-automodule MOCK_REQUIRE_PACKAGES = [] -with open(os.path.join(PATH_ROOT, "requirements", "install.txt"), "r") as fp: +with open(os.path.join(PATH_ROOT, "requirements", "install.txt")) as fp: for ln in fp.readlines(): found = [ln.index(ch) for ch in list(",=<>#") if ch in ln] pkg = ln[: min(found)] if found else ln if pkg.rstrip(): MOCK_REQUIRE_PACKAGES.append(pkg.rstrip()) -with open(os.path.join(PATH_ROOT, "requirements", "install_async.txt"), "r") as fp: +with open(os.path.join(PATH_ROOT, "requirements", "install_async.txt")) as fp: for ln in fp.readlines(): found = [ln.index(ch) for ch in list(",=<>#") if ch in ln] pkg = ln[: min(found)] if found else ln @@ -443,7 +442,7 @@ def find_source(): # do mapping from latest tags to master branch = {"latest": "master", "stable": "master"}.get(branch, branch) filename = "/".join([branch] + filename.split("/")[1:]) - return "https://github.com/%s/%s/blob/%s" % (github_user, github_repo, filename) + return f"https://github.com/{github_user}/{github_repo}/blob/{filename}" autodoc_member_order = "groupwise" diff --git a/rising/_version.py b/rising/_version.py index a46102a..deac4ee 100644 --- a/rising/_version.py +++ b/rising/_version.py @@ -80,7 +80,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env= [c] + args, cwd=cwd, env=env, stdout=subprocess.PIPE, stderr=(subprocess.PIPE if hide_stderr else None) ) break - except EnvironmentError: + except OSError: e = sys.exc_info()[1] if e.errno == errno.ENOENT: continue @@ -90,7 +90,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env= 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 = p.communicate()[0].strip() if sys.version_info[0] >= 3: @@ -127,7 +127,7 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): root = os.path.dirname(root) # up a level if verbose: - print("Tried directories %s but none started with prefix %s" % (str(rootdirs), parentdir_prefix)) + print(f"Tried directories {str(rootdirs)} but none started with prefix {parentdir_prefix}") raise NotThisMethod("rootdir doesn't start with parentdir_prefix") @@ -140,7 +140,7 @@ def git_get_keywords(versionfile_abs): # _version.py. keywords = {} try: - f = open(versionfile_abs, "r") + f = open(versionfile_abs) for line in f.readlines(): if line.strip().startswith("git_refnames ="): mo = re.search(r'=\s*"(.*)"', line) @@ -155,7 +155,7 @@ def git_get_keywords(versionfile_abs): if mo: keywords["date"] = mo.group(1) f.close() - except EnvironmentError: + except OSError: pass return keywords @@ -179,11 +179,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): if verbose: print("keywords are unexpanded, not using") raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) + refs = {r.strip() for r in refnames.strip("()").split(",")} # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of # just "foo-1.0". If we see a "tag: " prefix, prefer those. TAG = "tag: " - tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)]) + tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)} if not tags: # Either we're using git < 1.8.3, or there really are no tags. We use # a heuristic: assume all version tags have a digit. The old git %d @@ -192,7 +192,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): # between branches and tags. By ignoring refnames without digits, we # filter out many common branch names like "release" and # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r"\d", r)]) + tags = {r for r in refs if re.search(r"\d", r)} if verbose: print("discarding '%s', no digits" % ",".join(refs - tags)) if verbose: @@ -285,7 +285,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): if verbose: fmt = "tag '%s' doesn't start with prefix '%s'" print(fmt % (full_tag, tag_prefix)) - pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % (full_tag, tag_prefix) + pieces["error"] = f"tag '{full_tag}' doesn't start with prefix '{tag_prefix}'" return pieces pieces["closest-tag"] = full_tag[len(tag_prefix) :] diff --git a/rising/interface.py b/rising/interface.py index 1bad49e..cf2ff1a 100644 --- a/rising/interface.py +++ b/rising/interface.py @@ -1,4 +1,4 @@ -class AbstractMixin(object): +class AbstractMixin: """ This class implements an interface which handles non processed arguments. Subclass all classes which mixin additional methods and attributes diff --git a/rising/loading/loader.py b/rising/loading/loader.py index d8ccd7e..7e3284e 100644 --- a/rising/loading/loader.py +++ b/rising/loading/loader.py @@ -2,7 +2,7 @@ import warnings from contextlib import contextmanager from functools import partial -from typing import Any, Callable, Generator, Iterator, Mapping, Optional, Sequence, Union +from typing import Any, Callable, Generator, Iterator, Mapping, Optional, Protocol, Sequence, Union, runtime_checkable import torch from threadpoolctl import threadpool_limits @@ -11,7 +11,7 @@ from torch.utils.data._utils.collate import default_convert from torch.utils.data.dataloader import _MultiProcessingDataLoaderIter as __MultiProcessingDataLoaderIter from torch.utils.data.dataloader import _SingleProcessDataLoaderIter as __SingleProcessDataLoaderIter -from typing_extensions import Protocol, Self, runtime_checkable +from typing_extensions import Self try: import numpy as np @@ -370,7 +370,7 @@ def patch_dataset(loader: DataLoader) -> Generator: loader._DataLoader__initialized = True -class BatchTransformer(object): +class BatchTransformer: """ A callable wrapping the collate_fn to enable transformations on a batch-basis. @@ -424,7 +424,7 @@ def __call__(self, *args, **kwargs) -> Any: return batch -class SampleTransformer(object): +class SampleTransformer: """ A dataset wrapper applying transforms to each retrieved sample of the dataset diff --git a/rising/transforms/functional/intensity.py b/rising/transforms/functional/intensity.py index 29ffe3b..414284a 100644 --- a/rising/transforms/functional/intensity.py +++ b/rising/transforms/functional/intensity.py @@ -273,8 +273,7 @@ def random_inversion( minv: float = 0.0, out: Optional[torch.Tensor] = None, ) -> torch.Tensor: - - if torch.rand((1)) < prob_inversion: + if torch.rand(1) < prob_inversion: # Inversion of curve out = maxv + minv - data else: diff --git a/rising/transforms/functional/painting.py b/rising/transforms/functional/painting.py index cfc8b1b..cddb711 100644 --- a/rising/transforms/functional/painting.py +++ b/rising/transforms/functional/painting.py @@ -6,7 +6,6 @@ def local_pixel_shuffle( data: torch.Tensor, n: int = -1, block_size: tuple = (0, 0, 0), rel_block_size: float = 0.1 ) -> torch.Tensor: - batch_size, channels, img_rows, img_cols, img_deps = data.size() if n < 0: @@ -42,10 +41,9 @@ def local_pixel_shuffle( def random_inpainting(data: torch.Tensor, n: int = 5, maxv: float = 1.0, minv: float = 0.0) -> torch.Tensor: - batch_size, channels, img_rows, img_cols, img_deps = data.size() - while n > 0 and torch.rand((1)) < 0.95: + while n > 0 and torch.rand(1) < 0.95: for b in range(batch_size): block_size_x = torch.randint(img_rows // 10, img_rows // 4, (1,)) block_size_y = torch.randint(img_rows // 10, img_rows // 4, (1,)) @@ -64,7 +62,6 @@ def random_inpainting(data: torch.Tensor, n: int = 5, maxv: float = 1.0, minv: f def random_outpainting(data: torch.Tensor, maxv: float = 1.0, minv: float = 0.0) -> torch.Tensor: - batch_size, channels, img_rows, img_cols, img_deps = data.size() out = torch.rand(data.size()) * (maxv - minv) + minv diff --git a/rising/transforms/kernel.py b/rising/transforms/kernel.py index 53a6af9..d43aabb 100644 --- a/rising/transforms/kernel.py +++ b/rising/transforms/kernel.py @@ -26,7 +26,7 @@ def __init__( padding_mode: str = "zero", keys: Sequence = ("data",), grad: bool = False, - **kwargs + **kwargs, ): """ Args: @@ -85,7 +85,7 @@ def get_conv(dim) -> Callable: elif dim == 3: return torch.nn.functional.conv3d else: - raise TypeError("Only 1, 2 and 3 dimensions are supported. Received {}.".format(dim)) + raise TypeError(f"Only 1, 2 and 3 dimensions are supported. Received {dim}.") def create_kernel(self) -> torch.Tensor: """ @@ -130,7 +130,7 @@ def __init__( padding_mode: str = "reflect", keys: Sequence = ("data",), grad: bool = False, - **kwargs + **kwargs, ): """ Args: @@ -161,7 +161,7 @@ def __init__( padding_mode=padding_mode, keys=keys, grad=grad, - **kwargs + **kwargs, ) def create_kernel(self) -> torch.Tensor: diff --git a/tests/loading/test_collate.py b/tests/loading/test_collate.py index 9e2a6cf..5e961c0 100644 --- a/tests/loading/test_collate.py +++ b/tests/loading/test_collate.py @@ -39,7 +39,7 @@ def test_numpy_collate_bool(self): def test_numpy_collate_str(self): # Should be a no-op arr = ["a", "b", "c"] - self.assertTrue((arr == numpy_collate(arr))) + self.assertTrue(arr == numpy_collate(arr)) @unittest.skipIf(np is None, "numpy is not available") def test_numpy_collate_ndarray(self): diff --git a/tests/loading/test_loader.py b/tests/loading/test_loader.py index 0fe26ae..92d0545 100644 --- a/tests/loading/test_loader.py +++ b/tests/loading/test_loader.py @@ -309,7 +309,7 @@ def test_pseudo_batch_dim_sequence(self): self.assertTrue(torch.allclose(unbatched[idx], input_sequence[idx])) def test_pseudo_batch_dim_custom_obj(self): - class Foo(object): + class Foo: self.bar = 5.0 transformer = SampleTransformer(self.dset) diff --git a/tests/test_interface.py b/tests/test_interface.py index 4a61844..1af6bd8 100644 --- a/tests/test_interface.py +++ b/tests/test_interface.py @@ -3,13 +3,13 @@ from rising import AbstractMixin -class Abstract(object): +class Abstract: def __init__(self, **kwargs): super().__init__() self.abstract = True -class AbstractForward(object): +class AbstractForward: def __init__(self, **kwargs): super().__init__(**kwargs) self.abstract = True diff --git a/versioneer.py b/versioneer.py index d386d5a..59999b6 100644 --- a/versioneer.py +++ b/versioneer.py @@ -275,7 +275,6 @@ """ -from __future__ import print_function try: import configparser @@ -328,7 +327,7 @@ def get_root(): me_dir = os.path.normcase(os.path.splitext(me)[0]) vsr_dir = os.path.normcase(os.path.splitext(versioneer_py)[0]) if me_dir != vsr_dir: - print("Warning: build in %s is using versioneer.py from %s" % (os.path.dirname(me), versioneer_py)) + print(f"Warning: build in {os.path.dirname(me)} is using versioneer.py from {versioneer_py}") except NameError: pass return root @@ -342,7 +341,7 @@ def get_config_from_root(root): # the top of versioneer.py for instructions on writing your setup.cfg . setup_cfg = os.path.join(root, "setup.cfg") parser = configparser.SafeConfigParser() - with open(setup_cfg, "r") as f: + with open(setup_cfg) as f: parser.readfp(f) VCS = parser.get("versioneer", "VCS") # mandatory @@ -398,7 +397,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env= [c] + args, cwd=cwd, env=env, stdout=subprocess.PIPE, stderr=(subprocess.PIPE if hide_stderr else None) ) break - except EnvironmentError: + except OSError: e = sys.exc_info()[1] if e.errno == errno.ENOENT: continue @@ -408,7 +407,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env= 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 = p.communicate()[0].strip() if sys.version_info[0] >= 3: @@ -423,7 +422,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env= LONG_VERSION_PY[ "git" -] = ''' +] = r''' # This file helps to compute a version number in source trees obtained from # git-archive tarball (such as those provided by githubs download-from-tag # feature). Distribution tarballs (built by setup.py sdist) and build @@ -943,7 +942,7 @@ def get_versions(): return {"version": "0+unknown", "full-revisionid": None, "dirty": None, "error": "unable to compute version", "date": None} -''' # noqa: W605 +''' @register_vcs_handler("git", "get_keywords") @@ -955,7 +954,7 @@ def git_get_keywords(versionfile_abs): # _version.py. keywords = {} try: - f = open(versionfile_abs, "r") + f = open(versionfile_abs) for line in f.readlines(): if line.strip().startswith("git_refnames ="): mo = re.search(r'=\s*"(.*)"', line) @@ -970,7 +969,7 @@ def git_get_keywords(versionfile_abs): if mo: keywords["date"] = mo.group(1) f.close() - except EnvironmentError: + except OSError: pass return keywords @@ -994,11 +993,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): if verbose: print("keywords are unexpanded, not using") raise NotThisMethod("unexpanded keywords, not a git-archive tarball") - refs = set([r.strip() for r in refnames.strip("()").split(",")]) + refs = {r.strip() for r in refnames.strip("()").split(",")} # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of # just "foo-1.0". If we see a "tag: " prefix, prefer those. TAG = "tag: " - tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)]) + tags = {r[len(TAG) :] for r in refs if r.startswith(TAG)} if not tags: # Either we're using git < 1.8.3, or there really are no tags. We use # a heuristic: assume all version tags have a digit. The old git %d @@ -1007,7 +1006,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose): # between branches and tags. By ignoring refnames without digits, we # filter out many common branch names like "release" and # "stabilization", as well as "HEAD" and "master". - tags = set([r for r in refs if re.search(r"\d", r)]) + tags = {r for r in refs if re.search(r"\d", r)} if verbose: print("discarding '%s', no digits" % ",".join(refs - tags)) if verbose: @@ -1100,7 +1099,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): if verbose: fmt = "tag '%s' doesn't start with prefix '%s'" print(fmt % (full_tag, tag_prefix)) - pieces["error"] = "tag '%s' doesn't start with prefix '%s'" % (full_tag, tag_prefix) + pieces["error"] = f"tag '{full_tag}' doesn't start with prefix '{tag_prefix}'" return pieces pieces["closest-tag"] = full_tag[len(tag_prefix) :] @@ -1145,13 +1144,13 @@ def do_vcs_install(manifest_in, versionfile_source, ipy): files.append(versioneer_file) present = False try: - f = open(".gitattributes", "r") + f = open(".gitattributes") for line in f.readlines(): if line.strip().startswith(versionfile_source): if "export-subst" in line.strip().split()[1:]: present = True f.close() - except EnvironmentError: + except OSError: pass if not present: f = open(".gitattributes", "a+") @@ -1185,7 +1184,7 @@ def versions_from_parentdir(parentdir_prefix, root, verbose): root = os.path.dirname(root) # up a level if verbose: - print("Tried directories %s but none started with prefix %s" % (str(rootdirs), parentdir_prefix)) + print(f"Tried directories {str(rootdirs)} but none started with prefix {parentdir_prefix}") raise NotThisMethod("rootdir doesn't start with parentdir_prefix") @@ -1212,7 +1211,7 @@ def versions_from_file(filename): try: with open(filename) as f: contents = f.read() - except EnvironmentError: + except OSError: raise NotThisMethod("unable to read _version.py") mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", contents, re.M | re.S) if not mo: @@ -1229,7 +1228,7 @@ def write_to_version_file(filename, versions): with open(filename, "w") as f: f.write(SHORT_VERSION_PY % contents) - print("set %s to '%s'" % (filename, versions["version"])) + print("set {} to '{}'".format(filename, versions["version"])) def plus_or_dot(pieces): @@ -1452,7 +1451,7 @@ def get_versions(verbose=False): try: ver = versions_from_file(versionfile_abs) if verbose: - print("got version from file %s %s" % (versionfile_abs, ver)) + print(f"got version from file {versionfile_abs} {ver}") return ver except NotThisMethod: pass @@ -1723,7 +1722,7 @@ def do_setup(): root = get_root() try: cfg = get_config_from_root(root) - except (EnvironmentError, configparser.NoSectionError, configparser.NoOptionError) as e: + except (OSError, configparser.NoSectionError, configparser.NoOptionError) as e: if isinstance(e, (EnvironmentError, configparser.NoSectionError)): print("Adding sample versioneer config to setup.cfg", file=sys.stderr) with open(os.path.join(root, "setup.cfg"), "a") as f: @@ -1748,9 +1747,9 @@ def do_setup(): ipy = os.path.join(os.path.dirname(cfg.versionfile_source), "__init__.py") if os.path.exists(ipy): try: - with open(ipy, "r") as f: + with open(ipy) as f: old = f.read() - except EnvironmentError: + except OSError: old = "" if INIT_PY_SNIPPET not in old: print(" appending to %s" % ipy) @@ -1769,12 +1768,12 @@ def do_setup(): manifest_in = os.path.join(root, "MANIFEST.in") simple_includes = set() try: - with open(manifest_in, "r") as f: + with open(manifest_in) as f: for line in f: if line.startswith("include "): for include in line.split()[1:]: simple_includes.add(include) - except EnvironmentError: + except OSError: pass # That doesn't cover everything MANIFEST.in can do # (http://docs.python.org/2/distutils/sourcedist.html#commands), so @@ -1805,7 +1804,7 @@ def scan_setup_py(): found = set() setters = False errors = 0 - with open("setup.py", "r") as f: + with open("setup.py") as f: for line in f.readlines(): if "import versioneer" in line: found.add("import")