Attached patch moves "default" from 3.6 to 3.9
Additional changes:
Remove 3.5 from all
Change future to 3.10
Other point:
As 3.5 was never reall deployed, I think we can remove it from the
distibution.
As we have a lot of python3-* is obsoleded py python36-*
what is the best way to updated to python39-* when available ?
Regards
Marco
--- python-wheel.cygclass-bk 2021-12-31 08:53:33.186729100 +0100
+++ python-wheel.cygclass 2021-12-31 10:10:42.372875400 +0100
@@ -60,12 +60,12 @@
# inherit python-wheel
# DESCRIPTION
# A colon-seperated list of version(s) for which this module should be built.
-# Some aliases are also accepted:
-# * all: all supported 3.y versions (currently: 3.5 through 3.8)
-# * future: the default and upcoming 3.y versions (currently: 3.7, 3.8)
-# * default: the default 3.y version(s) (currently: 3.7, 3.8)
+# Some aliases are also accepted (at 2021 Dec 31st):
+# * all: all supported 3.y versions (currently: 3.6 through 3.9)
+# * future: the default and upcoming 3.y versions (currently: 3.9, 3.10)
+# * default: the default 3.y version(s) (currently: 3.8, 3.9)
# * 2: the default 2.x version (permanently 2.7)
-# * 3: the default 3.x version (currently: 3.8)
+# * 3: the default 3.x version (currently: 3.9)
# This variable must be defined before inheriting python-wheel.cygclass.
# If undefined, "default" is assumed.
# NOTES
@@ -93,11 +93,11 @@
for ver in ${PYTHON_WHEEL_VERSIONS//:/ }
do
case "${ver}" in
- all) _tmp_wheel_v+=3.5:3.6:3.7:3.8: ;;
- future) _tmp_wheel_v+=3.7:3.8: ;;
- default) _tmp_wheel_v+=3.7:3.8: ;;
+ all) _tmp_wheel_v+=3.6:3.7:3.8:3.9: ;;
+ future) _tmp_wheel_v+=3.9:3.10: ;;
+ default) _tmp_wheel_v+=3.8:3.9: ;;
2) _tmp_wheel_v+=2.7: ;;
- 3) _tmp_wheel_v+=3.8: ;;
+ 3) _tmp_wheel_v+=3.9: ;;
*) _tmp_wheel_v+=$ver: ;;
esac
done
@@ -128,7 +128,7 @@
# and MUST NOT be updated when defaults change
case ${ver} in
2.7) declare -g
python27_${PYTHON_WHEEL_NAME//[-\.]/_}_OBSOLETES="python-${PYTHON_WHEEL_NAME}
python2-${PYTHON_WHEEL_NAME}" ;;
- 3.6) declare -g
python36_${PYTHON_WHEEL_NAME//[-\.]/_}_OBSOLETES="python3-${PYTHON_WHEEL_NAME}"
;;
+ 3.9) declare -g
python39_${PYTHON_WHEEL_NAME//[-\.]/_}_OBSOLETES="python3-${PYTHON_WHEEL_NAME}"
;;
esac
declare -g
python${ver/.}_${PYTHON_WHEEL_NAME//[-\.]/_}_CONTENTS="usr/lib/python${ver}/site-packages/
usr/share/doc/python${ver/.}-${PYTHON_WHEEL_NAME}"
done
@@ -195,7 +195,7 @@
# ENSUREPIP_OPTIONS=install: pipX, pipX.Y, easy_install-X.Y
case ${ver} in
- 2.7|3.8) export ENSUREPIP_OPTIONS="install" ;;
+ 2.7|3.9) export ENSUREPIP_OPTIONS="install" ;;
*) export ENSUREPIP_OPTIONS="altinstall" ;;
esac
pip${ver} install -I dist/${whl} --root ${D} --prefix /usr
--no-compile --no-deps --no-warn-script-location || error "pip${ver} install
failed"
