From 544108eafd2be9f1b6fbee63b60f1cb617d135ac Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 30 Oct 2024 13:35:48 +0800 Subject: [PATCH] msys2: get python by transitive dependency --- msys2/PKGBUILD.common | 2 +- msys2/artiq_dependencies.txt | 1 - msys2/comtools_dependencies.txt | 1 - msys2/make_msys2_packages.sh | 2 +- msys2/sipyco_dependencies.txt | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/msys2/PKGBUILD.common b/msys2/PKGBUILD.common index 0089a50..619de79 100644 --- a/msys2/PKGBUILD.common +++ b/msys2/PKGBUILD.common @@ -7,7 +7,7 @@ sha256sums=("SKIP") build() { mkdir clang64 - export PYTHONPATH=`pwd`/clang64/lib/python3.11/site-packages + export PYTHONPATH=`pwd`/clang64/lib/python3.12/site-packages chmod +w -R source cd source wine-msys2-build python -m build --wheel --skip-dependency-check --no-isolation diff --git a/msys2/artiq_dependencies.txt b/msys2/artiq_dependencies.txt index 063130b..7a2977a 100644 --- a/msys2/artiq_dependencies.txt +++ b/msys2/artiq_dependencies.txt @@ -1,4 +1,3 @@ -mingw-w64-clang-x86_64-python3.11 mingw-w64-clang-x86_64-python-h5py mingw-w64-clang-x86_64-python-pyqt6 mingw-w64-clang-x86_64-qt6-svg diff --git a/msys2/comtools_dependencies.txt b/msys2/comtools_dependencies.txt index 6dd15df..3991e38 100644 --- a/msys2/comtools_dependencies.txt +++ b/msys2/comtools_dependencies.txt @@ -1,3 +1,2 @@ -mingw-w64-clang-x86_64-python3.11 mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-aiohttp diff --git a/msys2/make_msys2_packages.sh b/msys2/make_msys2_packages.sh index ab87996..01bee23 100755 --- a/msys2/make_msys2_packages.sh +++ b/msys2/make_msys2_packages.sh @@ -13,7 +13,7 @@ curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pac fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \ --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \ - mingw-w64-clang-x86_64-cc mingw-w64-clang-x86_64-python3.11 \ + mingw-w64-clang-x86_64-cc \ mingw-w64-clang-x86_64-python-numpy \ mingw-w64-clang-x86_64-python-setuptools mingw-w64-clang-x86_64-python-build mingw-w64-clang-x86_64-python-installer > $MSYS2DIR/packages.txt diff --git a/msys2/sipyco_dependencies.txt b/msys2/sipyco_dependencies.txt index a33a5e6..19ade38 100644 --- a/msys2/sipyco_dependencies.txt +++ b/msys2/sipyco_dependencies.txt @@ -1,3 +1,2 @@ -mingw-w64-clang-x86_64-python3.11 mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-pybase64