From 9a56497dd7f2edd357d09c18d0f521aea2d830bc Mon Sep 17 00:00:00 2001 From: no92 Date: Wed, 9 Aug 2023 01:55:21 +0200 Subject: [PATCH 1/3] github: bump python version to 3.11 for black --- .github/workflows/black.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index b727c7b..607f14e 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: '3.11' - name: Install the test requirements run: "pip install '.[test]'" - uses: psf/black@stable From 0904bf0db27fc805dadb75869d7d5b06766f7854 Mon Sep 17 00:00:00 2001 From: no92 Date: Wed, 9 Aug 2023 01:13:53 +0200 Subject: [PATCH 2/3] meta: fix formatting with latest black --- xbstrap/base.py | 14 +++++++------- xbstrap/pipeline/__init__.py | 4 ++-- xbstrap/util.py | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/xbstrap/base.py b/xbstrap/base.py index b94cba6..db4c578 100644 --- a/xbstrap/base.py +++ b/xbstrap/base.py @@ -2836,7 +2836,7 @@ def add_source_dependencies(s): item.require_edges.add((action.PATCH_SRC, dep_source)) def add_tool_dependencies(s): - for (tool_name, stage_name) in s.tool_stage_dependencies: + for tool_name, stage_name in s.tool_stage_dependencies: dep_tool = self._cfg.get_tool_pkg(tool_name) if self.build_scope is not None and dep_tool not in self.build_scope: item.require_edges.add((action.WANT_TOOL, dep_tool)) @@ -3073,14 +3073,14 @@ def activate(root_action, root_subject): visit(item.require_edges) # Activate wanted items. - for (action, subject) in self.wanted: + for action, subject in self.wanted: item = self._items[(action, subject)] item.build_span = True if not self.check or item.is_missing: activate(action, subject) # Discover all items reachable by build edges. - for (action, subject) in reversed(self._order): + for action, subject in reversed(self._order): item = self._items[(action, subject)] if not item.build_span: continue @@ -3098,7 +3098,7 @@ def is_outdated(item, dep_item): return False return dep_ts > ts - for (action, subject) in self._order: + for action, subject in self._order: item = self._items[(action, subject)] # Unless we're doing a recursive update, we only follow check items # that are reachable by build edges. @@ -3160,7 +3160,7 @@ def run_plan(self): _util.log_info("Running the following plan:") else: _util.log_info("Nothing to do") - for (action, subject) in scheduled: + for action, subject in scheduled: if isinstance(subject, HostStage): if subject.stage_name: eprint( @@ -3199,7 +3199,7 @@ def run_plan(self): return any_failed_items = False - for (n, (action, subject)) in enumerate(scheduled): + for n, (action, subject) in enumerate(scheduled): item = self._items[(action, subject)] # Check if any prerequisites failed; this can generally only happen with --keep-going. @@ -3329,7 +3329,7 @@ def emit_progress(status): if any_failed_items: _util.log_info("The following steps failed:") - for (action, subject) in scheduled: + for action, subject in scheduled: item = self._items[(action, subject)] assert item.exec_status != ExecutionStatus.NULL if item.exec_status == ExecutionStatus.SUCCESS: diff --git a/xbstrap/pipeline/__init__.py b/xbstrap/pipeline/__init__.py index 21ba5ca..56803eb 100755 --- a/xbstrap/pipeline/__init__.py +++ b/xbstrap/pipeline/__init__.py @@ -182,7 +182,7 @@ def do_compute_graph(args): "architecture": af.architecture, } ) - for (action, subject) in plan.materialized_steps(): + for action, subject in plan.materialized_steps(): if action == xbstrap.base.Action.WANT_TOOL: if subject in job.tools: continue @@ -237,7 +237,7 @@ def do_compute_graph(args): plan.wanted.update([(xbstrap.base.Action.RUN, task)]) plan.compute_plan(no_ordering=True) - for (action, subject) in plan.materialized_steps(): + for action, subject in plan.materialized_steps(): if action == xbstrap.base.Action.WANT_TOOL: if subject in item.job.tools: continue diff --git a/xbstrap/util.py b/xbstrap/util.py index a679f58..3b0990d 100644 --- a/xbstrap/util.py +++ b/xbstrap/util.py @@ -72,7 +72,6 @@ def build_environ_paths(environ, varname, prepend): def interactive_download(url, path): - istty = os.isatty(1) # This is stdout. if istty: eprint("...", end="") # This will become the status line. From 0761c3fdee3b5e07218a16d77a442bba30c5a5bc Mon Sep 17 00:00:00 2001 From: no92 Date: Fri, 27 Oct 2023 18:05:42 +0200 Subject: [PATCH 3/3] prereqs: fix download of xbps --- xbstrap/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbstrap/__init__.py b/xbstrap/__init__.py index ef5c7d4..3af3c3c 100755 --- a/xbstrap/__init__.py +++ b/xbstrap/__init__.py @@ -839,7 +839,7 @@ def do_prereqs(args): tar.extract(info, bin_dir) os.chmod(os.path.join(bin_dir, "cbuildrt"), 0o755) if "xbps" in comps: - url = "https://alpha.de.repo.voidlinux.org/static" + url = "https://repo-default.voidlinux.org/static" url += "/xbps-static-static-0.59_5.x86_64-musl.tar.xz" tar_path = os.path.join(home, "xbps.tar.xz")