Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make list_updatable_packages Python 3.8 compatible #8356

Merged
merged 1 commit into from Aug 16, 2022
Merged

Make list_updatable_packages Python 3.8 compatible #8356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 6 additions & 8 deletions list_updatable_packages
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ import subprocess
import sys
from itertools import chain
from pathlib import Path
from typing import Generator, Iterable, Mapping, Optional, Tuple
from typing import Dict, Generator, Iterable, Mapping, Optional, Tuple

import requests
import tempfile
Expand All @@ -20,7 +20,7 @@ class Spec:
self.path = path
spec = path.read_text()
self.lines = spec.splitlines()
self._globals: Optional[dict] = None
self._globals: Optional[Mapping[str, str]] = None

@property
def directory(self) -> str:
Expand Down Expand Up @@ -99,7 +99,7 @@ def find_packaged_specs() -> Generator[Tuple[Spec, None], None, None]:
yield spec, None


def parse_gemfile_lock(gemfile_lock: str) -> list[dict]:
def parse_gemfile_lock(gemfile_lock: str) -> Iterable[Mapping[str, str]]:
with tempfile.TemporaryDirectory() as tmpdirname:
with open(f'{tmpdirname}/Gemfile.lock', 'w') as fp:
fp.write(gemfile_lock)
Expand All @@ -111,8 +111,6 @@ def parse_gemfile_lock(gemfile_lock: str) -> list[dict]:
script = Path(__file__).absolute().parent / 'parse-gemfile-lock'
return json.loads(subprocess.check_output([script], universal_newlines=True, cwd=tmpdirname))

return {}


def fetch_gemfile_lock(url) -> str:
if DEBUG: print(f'Fetching Gemfile.lock from {url}')
Expand All @@ -130,15 +128,15 @@ def latest_version(spec: Spec) -> str:
raise ValueError('Unable to determine latest version', spec)


def merge_specs(specs: Iterable[Tuple[Spec, Optional[str]]]) -> dict[Spec, Optional[str]]:
def merge_specs(specs: Iterable[Tuple[Spec, Optional[str]]]) -> Mapping[Spec, Optional[str]]:
"""
Merge specs

This can process the same spec file multiple times. If a spec is already listed but without a
version, it will take the more specific constraint. The last entry is used if a constraint was
already given while a warning is printed.
"""
result: dict[Spec, Optional[str]] = {}
result: Dict[Spec, Optional[str]] = {}
for spec, new_version in specs:
if result.get(spec) not in (None, new_version):
# TODO: GH annotation?
Expand All @@ -149,7 +147,7 @@ def merge_specs(specs: Iterable[Tuple[Spec, Optional[str]]]) -> dict[Spec, Optio
return result


def build_matrix(specs: dict[Spec, Optional[str]]) -> Generator[dict, None, None]:
def build_matrix(specs: Mapping[Spec, Optional[str]]) -> Generator[Mapping[str, Optional[str]], None, None]:
for spec, new_version in specs.items():
try:
current_version = spec.version
Expand Down