231201

Author: KumaTea

src/build.py

@@ -305,7 +305,7 @@ def uninst_all(ver: str, py_path: str, plat: str = 'win', upper_pbar: tqdm = Non
 
     # ensure tools
     p = subprocess.Popen(
-        f'{py_path} -m pip install pip setuptools wheel'.split(),
+        f'{py_path} -m pip install'.split() + NO_UNINST,
         stdout=subprocess.PIPE, stderr=subprocess.PIPE
     )
     popen_reader(p)

src/check_dup.py

@@ -0,0 +1,6 @@
+from tools import get_plat_dup, get_exact_dup
+
+
+if __name__ == '__main__':
+    get_plat_dup()
+    get_exact_dup()

src/sha_check.py src/check_sha.py

@@ -16,7 +16,7 @@ def get_local_whl_dict(d: list) -> dict:
     return whl_dict
 
 
-local_whl_dict = get_local_whl_dict([WIN_WHEEL_DIR, LINUX_WHEEL_DIR])
+local_whl_dict = get_local_whl_dict([LINUX_WHEEL_DIR, WIN_WHEEL_DIR])
 
 
 def get_saved_sha256sums():

src/versions.py src/config_ver.py

@@ -13,6 +13,7 @@ sed -e 's!^metalink=!#metalink=!g' -e 's!^#baseurl=!baseurl=!g' -e 's!https\?://
 
 # adduser kuma
 # passwd kuma
+# chown -R kuma:kuma /home/kuma
 
 # ====== TOOLS ======
 
@@ -39,7 +40,7 @@ if status is-interactive
 end
 
 source /opt/rh/devtoolset-10/enable.fish
-export PATH="/home/kuma/.cargo/bin:$PATH"
+export PATH="/home/kuma/.cargo/bin:\$PATH"
 
 alias python='/usr/local/bin/python3.12'
 alias python3='/usr/local/bin/python3.12'
@@ -51,7 +52,7 @@ alias kuma='su kuma'
 alias sudo='/usr/bin/sudo'
 alias apt='dnf'
 EOF
-cp /home/kuma/.config/fish/config.fish .config/fish/config.fish
+ln -sf /home/kuma/.config/fish/config.fish .config/fish/config.fish
 
 cat << EOF >> .bashrc
 source /opt/rh/devtoolset-10/enable
@@ -65,16 +66,16 @@ export PATH=/opt/rh/devtoolset-10/root/usr/bin:/usr/local/sbin:/usr/local/bin:/u
 export MANPATH=/opt/rh/devtoolset-10/root/usr/share/man
 export INFOPATH=/opt/rh/devtoolset-10/root/usr/share/info
 export PCP_DIR=/opt/rh/devtoolset-10/root
-export C_INCLUDE_PATH="$C_INCLUDE_PATH:/opt/openblas/include"
-export CPATH="$CPATH:/opt/openblas/include"
-export LIBRARY_PATH="$LIBRARY_PATH:/opt/openblas/lib"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/openblas/lib:/opt/rh/devtoolset-10/root/usr/lib64/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyn:/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib"
+export C_INCLUDE_PATH="\$C_INCLUDE_PATH:/opt/openblas/include"
+export CPATH="\$CPATH:/opt/openblas/include"
+export LIBRARY_PATH="\$LIBRARY_PATH:/opt/openblas/lib"
+export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:/opt/openblas/lib:/opt/rh/devtoolset-10/root/usr/lib64/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyn:/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib"
 export PKG_CONFIG_PATH=/opt/openblas/lib/pkgconfig:/opt/rh/devtoolset-10/root/usr/lib64/pkgconfig:/usr/local/lib/pkgconfig
 EOF
 
 # ====== BUILD DEPS ======
 
-sudo dnf install autogen bash ca-certificates centos-release-scl cmake curl gettext git libffi-devel libjpeg-devel nano ninja-build openssl-devel wget xz zlib-devel
+sudo dnf install -y autogen bash ca-certificates centos-release-scl cmake curl gettext git libffi-devel libjpeg-devel nano ninja-build openssl-devel wget xz zlib-devel
 
 # Pillow
 cd /tmp
@@ -88,7 +89,7 @@ cd ..
 rm -rvf libpng-1.6.40 libpng-1.6.40.tar.xz
 
 # others
-sudo dnf -y install postgresql-devel libxml2-devel libxslt-devel unixODBC-devel freetds-devel
+sudo dnf install -y postgresql-devel libxml2-devel libxslt-devel unixODBC-devel freetds-devel
 
 # 
 # error "confluent-kafka-python requires librdkafka v2.3.0 or later.
@@ -197,6 +198,6 @@ tar xvzf pypy3.9.tar.gz
 tar xvzf pypy3.8.tar.gz
 cp -rvf ./usr/* /usr/
 rm -rvf usr pypy3.10.tar.gz pypy3.9.tar.gz pypy3.8.tar.gz
-# rm -f /lib64/libpypy*
+# rm -vf /lib64/libpypy*
 
 sudo ldconfig

src/get_packages.py src/gen_packages.py

@@ -6,8 +6,8 @@
 import subprocess
 from config import *
 from tqdm import tqdm
-from versions import PYTHON_TO_PYPY
 from gen_whl import saved_sha256sums
+from config_ver import PYTHON_TO_PYPY
 
 
 def get_pip_cache_dir() -> str: