python310: Update to version 3.10.1 (#5044)

* python310: Update to version 3.10.1 * python310: Add /usr/local/bin/python3.10 symlink
SynoCommunity · Jan 4, 2022 · 744fccc · 744fccc
1 parent 3a45865
commit 744fccc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/cross/python310/Makefile b/cross/python310/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = python310
-PKG_VERS = 3.10.0
+PKG_VERS = 3.10.1
 PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
 PKG_EXT = tar.xz
 PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
@@ -135,16 +135,16 @@ python310_post_install: $(WORK_DIR)/python-cc.mk
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==21.3.1"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==21.3.1"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==58.3.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==58.3.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "wheel==0.37.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "wheel==0.37.0"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==60.2.0"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==60.2.0"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "wheel==0.37.1"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "wheel==0.37.1"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "cffi==1.15.0"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "cffi==1.15.0"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "cryptography==3.3.2"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "cryptography==3.3.2"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "poetry==1.1.11"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "poetry==1.1.11"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "poetry==1.1.12"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "poetry==1.1.12"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "Cython==0.29.26"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "Cython==0.29.26"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "flit==3.6.0"

diff --git a/cross/python310/digests b/cross/python310/digests
@@ -1,3 +1,3 @@
-Python-3.10.0.tar.xz SHA1 c6114b411b7e6d26fc9887c11c0800d9625f1ade
-Python-3.10.0.tar.xz SHA256 5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
-Python-3.10.0.tar.xz MD5 3e7035d272680f80e3ce4e8eb492d580
+Python-3.10.1.tar.xz SHA1 1a534e99b95db0d30dacc8f10418cc5758b04df7
+Python-3.10.1.tar.xz SHA256 a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177
+Python-3.10.1.tar.xz MD5 789210934745a65247a3ebf5da9adb64
diff --git a/native/python310/Makefile b/native/python310/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = python310
-PKG_VERS = 3.10.0
+PKG_VERS = 3.10.1
 PKG_EXT = tar.xz
 PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -31,7 +31,7 @@ python310_native_post_install: $(WORK_DIR)/python-native.mk
 	@$(MSG) Installing pip, setuptools and crossenv
 	@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
 	@$(RUN) $(PYTHON) get-pip.py "pip==21.3.1"
-	@$(PIP) install "setuptools==58.3.0" "cffi==1.15" "crossenv==1.1.4"
+	@$(PIP) install "setuptools==60.2.0" "cffi==1.15" "crossenv==1.1.4"
 
 $(WORK_DIR)/python-native.mk:
 	@echo PIP=$(PIP_NATIVE) >> $@
diff --git a/native/python310/digests b/native/python310/digests
@@ -1,3 +1,3 @@
-Python-3.10.0.tar.xz SHA1 c6114b411b7e6d26fc9887c11c0800d9625f1ade
-Python-3.10.0.tar.xz SHA256 5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002
-Python-3.10.0.tar.xz MD5 3e7035d272680f80e3ce4e8eb492d580
+Python-3.10.1.tar.xz SHA1 1a534e99b95db0d30dacc8f10418cc5758b04df7
+Python-3.10.1.tar.xz SHA256 a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177
+Python-3.10.1.tar.xz MD5 789210934745a65247a3ebf5da9adb64
diff --git a/spk/python310/Makefile b/spk/python310/Makefile
@@ -1,13 +1,11 @@
 SPK_NAME = python310
-SPK_VERS = 3.10.0
+SPK_VERS = 3.10.1
 SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
 SPK_REV = 6
 SPK_ICON = src/python3.png
 
 DEPENDS  = cross/$(SPK_NAME)
-# Mandatory binaries for wheel
-# setup during package install
-DEPENDS += cross/setuptools cross/pip cross/wheel
+DEPENDS += cross/pip
 
 ##
 ## All configurations below are optional and
@@ -73,7 +71,7 @@ DESCRIPTION_FRE = Langage de programmation Python.
 DESCRIPTION_SPN = Lenguaje de programación Python.
 STARTABLE = no
 DISPLAY_NAME = Python 3.10
-CHANGELOG = "1. Initial release"
+CHANGELOG = "1. Update to python 3.10.1"
 
 HOMEPAGE = https://www.python.org
 LICENSE  = PSF
@@ -86,6 +84,8 @@ PYTHON_LIB_DIR = lib/python$(SPK_VERS_MAJOR_MINOR)
 
 POST_STRIP_TARGET = python310_extra_install
 
+SPK_USR_LOCAL_LINKS = bin:bin/python3.10
+
 include ../../mk/spksrc.spk.mk
 
 .PHONY: python310_extra_install

diff --git a/spk/python310/src/requirements-pure.txt b/spk/python310/src/requirements-pure.txt
@@ -1,7 +1,7 @@
 # basic default wheels
-setuptools==60.2.0
 #pip==21.3.1             ==> Always install latest version (service-setup.sh:install_python_virtualenv)
-wheel==0.37.1
+#setuptools==60.2.0      ==> Version provided by default with Python 3.10.1
+#wheel==0.37.1           ==> Version provided by default with Python 3.10.1
 
 # Always use latest version available
 # certifi==2021.10.8
@@ -11,4 +11,4 @@ certifi
 # to create their local virtualenv
 # in order to install wheels within
 # their running environment
-virtualenv==20.11.2
+virtualenv==20.13.0