@@ -83,9 +83,9 @@ OS="not-detected-yet"
8383ARCH=" not-detected-yet"
8484
8585# Initialize default values, some are overwritten from pythia.conf.
86- PYTHON_NAME=" not.yet.defined"
8786PYTHON_CONFIGURATION=" NOT-YET-DEFINED"
88- PYTHON_VERSION=" not.defined.yet"
87+ PYTHON_NAME=" not-yet-determined"
88+ PYTHON_VERSION=" not-determined-yet"
8989PYTHON_PLATFORM=" unknown-os-and-arch"
9090BINARY_DIST_URI=" https://github.com/chevah/pythia/releases/download"
9191PIP_INDEX_URL=" https://pypi.org/simple"
@@ -107,7 +107,7 @@ check_source_folder() {
107107# Called to trigger the entry point in the virtual environment.
108108# Can be overwritten in pythia.conf
109109execute_venv () {
110- " $PYTHON_BIN " " from paver.tasks import main; main()" " $@ "
110+ " $PYTHON_BIN " X utf8 - c " from paver.tasks import main; main()" " $@ "
111111}
112112
113113
@@ -149,6 +149,8 @@ clean_build() {
149149 delete_folder " $DIST_FOLDER "
150150 echo " Removing publish/..."
151151 delete_folder publish/
152+ echo " Removing node_modules/..."
153+ delete_folder node_modules/
152154
153155 # In some case pip hangs with a build folder in temp and
154156 # will not continue until it is manually removed.
@@ -189,7 +191,7 @@ delete_folder() {
189191 local target=" $1 "
190192 # On Windows, we use internal command prompt for maximum speed.
191193 # See: https://stackoverflow.com/a/6208144/539264
192- if [ " $OS " = " win " ; then
194+ if [ " $OS " = " windows " ; then
193195 if [ -d " $target " ; then
194196 cmd //c " del /f/s/q $target > nul"
195197 cmd //c " rmdir /s/q $target "
@@ -225,7 +227,7 @@ execute() {
225227update_path_variables () {
226228 resolve_python_version
227229
228- if [ " $OS " = " win " ; then
230+ if [ " $OS " = " windows " ; then
229231 PYTHON_BIN=" /lib/python.exe"
230232 PYTHON_LIB=" /lib/Lib/"
231233 else
@@ -293,12 +295,15 @@ resolve_python_version() {
293295 candidate=" ${version_configuration_array[$i]} "
294296 candidate_platform=" $( echo " $candidate " | cut -d" @" ) "
295297 candidate_version=" $( echo " $candidate " | cut -d" @" ) "
298+ candidate_name=" $( echo " $candidate_version " | cut -d" ." ) "
296299 if [ " $candidate_platform " = " default" ; then
297- # On first pass, we set the default version.
300+ # On first pass, we set the default version and name .
298301 PYTHON_VERSION=" $candidate_version "
302+ PYTHON_NAME=" python${candidate_name} "
299303 elif [ -z " ${PYTHON_PLATFORM% " $candidate_platform " * } " ; then
300- # If matching a specific platform, we overwrite the default version .
304+ # If matching a specific platform, we overwrite the defaults .
301305 PYTHON_VERSION=" $candidate_version "
306+ PYTHON_NAME=" python${candidate_name} "
302307 fi
303308 done
304309}
@@ -308,7 +313,7 @@ resolve_python_version() {
308313# Install base package.
309314#
310315install_base_deps () {
311- echo " ::groups ::Installing base requirements:" " ${BASE_REQUIREMENTS[@]} "
316+ echo " ::group ::Installing base requirements:" " ${BASE_REQUIREMENTS[@]} "
312317
313318 set +e
314319 # There is a bug in pip/setuptools when using custom build folders.
@@ -365,7 +370,7 @@ get_binary_dist() {
365370 local dist_name=" $1 "
366371 local remote_base_url=" $2 "
367372
368- echo " Getting $dist_name from $remote_base_url ..."
373+ echo " Getting $dist_name from $remote_base_url ..."
369374
370375 tar_gz_file=" $dist_name "
371376 tar_file=" $dist_name "
@@ -393,7 +398,7 @@ test_version_exists() {
393398 local remote_base_url=" $1 "
394399 local target_file=" python-$PYTHON_VERSION -$OS -$ARCH .tar.gz"
395400
396- echo " Checking $remote_base_url /$PYTHON_VERSION /$target_file ..."
401+ echo " Checking $remote_base_url /$PYTHON_VERSION /$target_file ..."
397402 " ${ONLINETEST_CMD[@]} " " $remote_base_url " " $PYTHON_VERSION " " $target_file "
398403 return $?
399404}
@@ -473,7 +478,8 @@ copy_python() {
473478 get_python_dist " $BINARY_DIST_URI "
474479 fi
475480
476- echo " Copying Python distribution files... "
481+ echo " Copying Python distribution files from $python_distributable "
482+ " to $BUILD_FOLDER ... "
477483 cp -R " $python_distributable " * " $BUILD_FOLDER "
478484
479485 echo " ::endgroup::"
@@ -679,24 +685,28 @@ check_glibc_version(){
679685
680686check_musl_version (){
681687 local musl_version
688+ local musl_version_cleaned
682689 local musl_version_array
683690 local musl_version_unsupported=" false"
684691 local supported_musl11_version=24
685692
686693 echo " No specific runtime for the current distribution / version / arch."
687694 echo " Minimum musl version for this arch: 1.1.$supported_musl11_version ."
688695
689- # Tested with musl 1.1.24/1.2.2.
696+ # Tested with musl 1.1.24/1.2.2/1.2.4_git20230717/1.2.5 .
690697 musl_version=" $( grep -E ^" Version" " $ldd_output_file " | cut -d" " ) "
691698 rm " $ldd_output_file "
692699
693- if [[ " $musl_version " =~ [^[:digit:]\. ] ]]; then
694- (>&2 echo " Musl version should only have digits and dots, but:"
695- (>&2 echo " \$ musl_version=$musl_version "
700+ # Some Alpine Linux releases (e.g. Alpine 3.19) use git-versioned musl.
701+ musl_version_cleaned=" ${musl_version// _git/ .} "
702+
703+ if [[ " $musl_version_cleaned " =~ [^[:digit:]\. ] ]]; then
704+ (>&2 echo " Cleaned musl version should only have digits and dots, but"
705+ (>&2 echo " \$ musl_version_cleaned=$musl_version_cleaned "
696706 exit 25
697707 fi
698708
699- IFS=. read -r -a musl_version_array <<< " $musl_version "
709+ IFS=. read -r -a musl_version_array <<< " $musl_version_cleaned "
700710
701711 # Decrement supported_musl11_version above if building against older musl.
702712 if [ " ${musl_version_array[0]} " -lt 1 ]; then
@@ -736,7 +746,7 @@ detect_os() {
736746 case " $OS " in
737747 MINGW* |MSYS* )
738748 ARCH=" $( uname -m) "
739- OS=" win "
749+ OS=" windows "
740750 ;;
741751 Linux)
742752 ARCH=" $( uname -m) "
0 commit comments