diff --git a/brink.conf b/brink.conf index 62e81a6e7..493380b80 100644 --- a/brink.conf +++ b/brink.conf @@ -1,5 +1,5 @@ BASE_REQUIREMENTS='pip==20.3.4chevah chevah-brink==0.79.0 paver==1.2.4' -PYTHON_CONFIGURATION='default@2.7.18.241e9fe' +PYTHON_CONFIGURATION='default@2.7.18.90dc4a6' # For production packages there are 2 options: BINARY_DIST_URI='https://github.com/chevah/python-package/releases/download' #BINARY_DIST_URI='https://bin.chevah.com:20443/production' diff --git a/brink.sh b/brink.sh index c75df49f4..c551520a1 100755 --- a/brink.sh +++ b/brink.sh @@ -139,6 +139,10 @@ clean_build() { delete_folder ${DIST_FOLDER} echo "Removing publish..." delete_folder 'publish' + echo "Removing node_modules..." + delete_folder node_modules + echo "Removing web build" + delete_folder chevah/server/static/build/ # In some case pip hangs with a build folder in temp and # will not continue until it is manually removed. @@ -766,7 +770,12 @@ detect_os() { os_version_raw="$VERSION_ID" check_os_version "Red Hat Enterprise Linux" 8 \ "$os_version_raw" os_version_chevah - set_os_if_not_generic "rhel" $os_version_chevah + if [ ${os_version_chevah} == "8" ]; then + set_os_if_not_generic "rhel" $os_version_chevah + else + # OpenSSL 3.0.x not supported by cryptography 3.3.x. + check_linux_libc + fi ;; ubuntu|ubuntu-core) os_version_raw="$VERSION_ID" diff --git a/chevah_build b/chevah_build index 01adaa765..f3599d70a 100755 --- a/chevah_build +++ b/chevah_build @@ -345,7 +345,8 @@ case "$ARCH" in ;; esac # Only add to $MAKE if there is one, so that NMAKE on Windows is not confused. -if [ -n "${MAKE-}" ]; then +# But not on AIX, where there are random errors w/ parallel builds on IBM Cloud. +if [ -n "${MAKE-}" -a "${OS%aix*}" != "" ]; then export MAKE="$MAKE -j${JOBS}" fi