diff --git a/.github/workflows/gpu_test.yml b/.github/workflows/gpu_test.yml index e0be897532..f9e36e9c2e 100644 --- a/.github/workflows/gpu_test.yml +++ b/.github/workflows/gpu_test.yml @@ -1,13 +1,13 @@ # This workflow will install Python dependencies, run tests and lint with a variety of Python versions # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions -name: GPU Test V3 +name: GPU Test on: push: - branches: [ v3 ] + branches: [ main ] pull_request: - branches: [ v3 ] + branches: [ main ] workflow_dispatch: env: diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml index c5a239c274..85d48bddb1 100644 --- a/.github/workflows/hypothesis.yaml +++ b/.github/workflows/hypothesis.yaml @@ -3,11 +3,9 @@ on: push: branches: - "main" - - "v3" pull_request: branches: - "main" - - "v3" types: [opened, reopened, synchronize, labeled] schedule: - cron: "0 0 * * *" # Daily “At 00:00” UTC diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5683b62dff..ae24fca6f5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,13 +1,13 @@ # This workflow will install Python dependencies, run tests and lint with a variety of Python versions # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions -name: Test V3 +name: Test on: push: - branches: [ v3 ] + branches: [ main ] pull_request: - branches: [ v3 ] + branches: [ main ] workflow_dispatch: concurrency: diff --git a/pyproject.toml b/pyproject.toml index 593be36b75..059fa8fdb7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -211,6 +211,7 @@ extend-select = [ "B", # flake8-bugbear "C4", # flake8-comprehensions "FLY", # flynt + "G", # flake8-logging-format "I", # isort "ISC", # flake8-implicit-str-concat "PGH", # pygrep-hooks diff --git a/src/zarr/core/sync.py b/src/zarr/core/sync.py index 20f04f543b..8c5bc9c397 100644 --- a/src/zarr/core/sync.py +++ b/src/zarr/core/sync.py @@ -133,7 +133,7 @@ def sync( finished, unfinished = wait([future], return_when=asyncio.ALL_COMPLETED, timeout=timeout) if len(unfinished) > 0: - raise TimeoutError(f"Coroutine {coro} failed to finish in within {timeout}s") + raise TimeoutError(f"Coroutine {coro} failed to finish in within {timeout} s") assert len(finished) == 1 return_result = next(iter(finished)).result() diff --git a/src/zarr/storage/logging.py b/src/zarr/storage/logging.py index 59a796dc18..a29661729f 100644 --- a/src/zarr/storage/logging.py +++ b/src/zarr/storage/logging.py @@ -83,15 +83,15 @@ def log(self, hint: Any = "") -> Generator[None, None, None]: method = inspect.stack()[2].function op = f"{type(self._store).__name__}.{method}" if hint: - op += f"({hint})" - self.logger.info(f"Calling {op}") + op = f"{op}({hint})" + self.logger.info("Calling %s", op) start_time = time.time() try: self.counter[method] += 1 yield finally: end_time = time.time() - self.logger.info(f"Finished {op} [{end_time - start_time:.2f}s]") + self.logger.info("Finished %s [%.2f s]", op, end_time - start_time) @property def supports_writes(self) -> bool: