Fix an infinite loop when using `# fmt: on/off` ... (#3158)

[etc/vim.git] / gallery / gallery.py

diff --git a/gallery/gallery.py b/gallery/gallery.py
index 6b42ec3a6d490c2c0604f397110e449a74dbd180..be4d81dc4270be05a031c1c78df8a64b7b78a8aa 100755 (executable)
--- a/gallery/gallery.py
+++ b/gallery/gallery.py
@@ -10,10 +10,9 @@ from argparse import ArgumentParser, Namespace
 from concurrent.futures import ThreadPoolExecutor
 from functools import lru_cache, partial
 from pathlib import Path
 from concurrent.futures import ThreadPoolExecutor
 from functools import lru_cache, partial
 from pathlib import Path

-from typing import (  # type: ignore # typing can't see Literal
+from typing import (

     Generator,
     List,
     Generator,
     List,

-    Literal,

     NamedTuple,
     Optional,
     Tuple,
     NamedTuple,
     Optional,
     Tuple,


@@ -24,12 +23,11 @@ from urllib.request import urlopen, urlretrieve
 
 PYPI_INSTANCE = "https://pypi.org/pypi"
 PYPI_TOP_PACKAGES = (
 
 PYPI_INSTANCE = "https://pypi.org/pypi"
 PYPI_TOP_PACKAGES = (

-    "https://hugovk.github.io/top-pypi-packages/top-pypi-packages-{days}-days.json"
+    "https://hugovk.github.io/top-pypi-packages/top-pypi-packages-30-days.min.json"

 )
 INTERNAL_BLACK_REPO = f"{tempfile.gettempdir()}/__black"
 
 ArchiveKind = Union[tarfile.TarFile, zipfile.ZipFile]
 )
 INTERNAL_BLACK_REPO = f"{tempfile.gettempdir()}/__black"
 
 ArchiveKind = Union[tarfile.TarFile, zipfile.ZipFile]

-Days = Union[Literal[30], Literal[365]]

 
 subprocess.run = partial(subprocess.run, check=True)  # type: ignore
 # https://github.com/python/mypy/issues/1484
 
 subprocess.run = partial(subprocess.run, check=True)  # type: ignore
 # https://github.com/python/mypy/issues/1484


@@ -64,8 +62,8 @@ def get_pypi_download_url(package: str, version: Optional[str]) -> str:
     return cast(str, source["url"])
 
 
     return cast(str, source["url"])
 
 

-def get_top_packages(days: Days) -> List[str]:
-    with urlopen(PYPI_TOP_PACKAGES.format(days=days)) as page:
+def get_top_packages() -> List[str]:
+    with urlopen(PYPI_TOP_PACKAGES) as page:

         result = json.load(page)
 
     return [package["project"] for package in result["rows"]]
         result = json.load(page)
 
     return [package["project"] for package in result["rows"]]


@@ -74,7 +72,7 @@ def get_top_packages(days: Days) -> List[str]:
 def get_package_source(package: str, version: Optional[str]) -> str:
     if package == "cpython":
         if version is None:
 def get_package_source(package: str, version: Optional[str]) -> str:
     if package == "cpython":
         if version is None:

-            version = "master"
+            version = "main"

         return f"https://github.com/python/cpython/archive/{version}.zip"
     elif package == "pypy":
         if version is None:
         return f"https://github.com/python/cpython/archive/{version}.zip"
     elif package == "pypy":
         if version is None:


@@ -128,13 +126,12 @@ DEFAULT_SLICE = slice(None)  # for flake8
 
 def download_and_extract_top_packages(
     directory: Path,
 
 def download_and_extract_top_packages(
     directory: Path,

-    days: Days = 365,

     workers: int = 8,
     limit: slice = DEFAULT_SLICE,
 ) -> Generator[Path, None, None]:
     with ThreadPoolExecutor(max_workers=workers) as executor:
         bound_downloader = partial(get_package, version=None, directory=directory)
     workers: int = 8,
     limit: slice = DEFAULT_SLICE,
 ) -> Generator[Path, None, None]:
     with ThreadPoolExecutor(max_workers=workers) as executor:
         bound_downloader = partial(get_package, version=None, directory=directory)

-        for package in executor.map(bound_downloader, get_top_packages(days)[limit]):
+        for package in executor.map(bound_downloader, get_top_packages()[limit]):

             if package is not None:
                 yield package
 
             if package is not None:
                 yield package
 


@@ -248,9 +245,9 @@ def format_repos(repos: Tuple[Path, ...], options: Namespace) -> None:
                 black_version=black_version,
                 input_directory=options.input,
             )
                 black_version=black_version,
                 input_directory=options.input,
             )

-        git_switch_branch("master", repo=repo)
+        git_switch_branch("main", repo=repo)

 
 

-    git_switch_branch("master", repo=options.black_repo)
+    git_switch_branch("main", repo=options.black_repo)

 
 
 def main() -> None:
 
 
 def main() -> None:


@@ -296,7 +293,7 @@ def main() -> None:
         type=Path,
         help="Output directory to download and put result artifacts.",
     )
         type=Path,
         help="Output directory to download and put result artifacts.",
     )

-    parser.add_argument("versions", nargs="*", default=("master",), help="")
+    parser.add_argument("versions", nargs="*", default=("main",), help="")

 
     options = parser.parse_args()
     repos = init_repos(options)
 
     options = parser.parse_args()
     repos = init_repos(options)