Merge "Update other python dependencies."

ndk/checkbuild.py

@@ -2744,7 +2744,7 @@ def main() -> None:
                 ndk_dir, out_dir, dist_dir, args.system, args.build_number
             )
             packaged_size_bytes = package_path.stat().st_size
-            packaged_size = packaged_size_bytes // (2 ** 20)
+            packaged_size = packaged_size_bytes // (2**20)
 
     good = True
     test_timer = ndk.timer.Timer()

ndk/workqueue.py

@@ -556,7 +556,7 @@ def add_task(
         group: ShardingGroupType,
         func: Callable[..., ResultT],
         *args: Any,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> None:
         self.task_queues[group].put(Task(func, args, kwargs))
         self.num_tasks += 1

pyproject.toml

@@ -6,16 +6,16 @@ authors = ["The Android Open Source Project"]
 license = "Apache-2.0"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 
 [tool.poetry.dev-dependencies]
 # Poetry handles 0.* differently than other versions. ^0.1 may not upgrade to
 # 0.2, but ^1.1 may upgrade to 1.2.
 # https://python-poetry.org/docs/dependency-specification/
-mypy = "^0"
-pylint = "^2.12.2"
-pytest = "^6.2.5"
-black = "^21.12b0"
+mypy = "^0.971"
+pylint = "^2.15.0"
+pytest = "^7.1.2"
+black = "^22.6.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

scripts/update_kokoro_prebuilts.py

@@ -239,7 +239,7 @@ class LsLine:
     for ls_line in ls_output.stdout.splitlines():
         logger().debug("gsutil ls output: %s", ls_line)
         match = re.match(
-            fr"(gs://{GCS_BUCKET}/prod/"
+            rf"(gs://{GCS_BUCKET}/prod/"
             r"(.*)/"  # Kokoro job name (e.g. ndk/cmake/linux_release)
             r"\d+/"  # build number (e.g. 17)
             r"\d+-\d+)"  # timestamp (e.g. 20211109-203945)