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

refac(back): #1172 ignore win-arm64 wheels #1173

Merged
merged 1 commit into from
Sep 28, 2023
Merged

refac(back): #1172 ignore win-arm64 wheels #1173

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .mailmap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Github Octocat <noreply@github.com> GitHub <noreply@github.com>
GuangTao Zhang <gtrunsec@hardenedlinux.org> GTrunSec <gtrunsec@hardenedlinux.org>
John Perez <jperez@fluidattacks.com> John Perez <34050007+jpverde@users.noreply.github.com>
John Perez <mrjohnjairo10@gmail.com> John Perez <mrjohnjairo10@gmail.com>
Julian Gomez <jgomezb11@eafit.edu.co> Julian Gomez <jgomezb11@eafit.edu.co>
Julian Gomez Benitez <60365681+jgomezb11@users.noreply.github.com> Julian Gomez Benitez <60365681+jgomezb11@users.noreply.github.com>
Kevin Amado <kamadorueda@gmail.com> Kevin Amado <kamadorueda@gmail.com>
Luis Saavedra <lsaavedra@fluidattacks.com> Luis David Saavedra <40694133+ludsrill@users.noreply.github.com>
Luis Saavedra <lsaavedra@fluidattacks.com> Luis Saavedra <lsaavedra@fluidattacks.com>
Expand Down
10 changes: 10 additions & 0 deletions makes/utils/makePythonLock/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# shellcheck shell=bash

function main {
declare -A depWithLinks
local python_version="${1}"
local deps_yaml="${2}"
local sources_yaml="${3:-sources.yaml}"
Expand Down Expand Up @@ -71,6 +72,7 @@ function main {
*.exe) continue ;;
*-win32.whl) continue ;;
*-win_amd64.whl) continue ;;
*-win_arm64.whl) continue ;;
*) ;;
esac \
&& if ! in_array "${python_versions[${index}]}" "${implementations[@]}"; then
Expand All @@ -93,9 +95,17 @@ function main {
sources.json \
> sources2.json \
&& mv sources2.json sources.json \
&& IFS='/' read -ra ADDR <<< "$endpoint" \
&& depWithLinks["${ADDR[-3]}"]="" \
|| critical Unable to download "${file}"
done
done \
&& jq -erS \
--argjson depsWithLinks "$(echo "${!depWithLinks[@]}" | jq -Rc \
'split(" ") | map({(.): .}) | add')" \
'.closure |= with_entries(select(.key as $k | $depsWithLinks | has($k)))' \
sources.json > sources_filtered.json \
&& mv sources_filtered.json sources.json \
&& yj -jy < sources.json > "${sources_yaml}" \
&& info Generated a sources file at "${sources_yaml}"
}
Expand Down
3 changes: 1 addition & 2 deletions src/args/make-python-vscode-settings/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
__nixpkgs__,
makeTemplate,
...
}:
{
}: {
name,
env,
bins,
Expand Down
3 changes: 2 additions & 1 deletion src/args/python-override-utils/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ let
compose = let
# definition from nixpkgs.lib.reverseList
reverseList = xs: let l = builtins.length xs; in builtins.genList (n: builtins.elemAt xs (l - n - 1)) l;
in functions: val: builtins.foldl' (x: f: f x) val (reverseList functions);
in
functions: val: builtins.foldl' (x: f: f x) val (reverseList functions);
in {
inherit compose recursive_python_pkg_override no_check_override replace_pkg;
}
Loading