mirror of
https://github.com/openwrt/packages.git
synced 2025-12-22 21:14:32 +04:00
python3: bump to version 3.10.9
Refresh patches.
Bump setuptools to 65.5.0
Bump pip to 22.3.1
Removed patch: patches-pip/001-pep517-pyc-fix.patch
No longer needed as per:
fa4b2efbab
Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
This commit is contained in:
@@ -8,12 +8,12 @@
|
|||||||
# Note: keep in sync with setuptools & pip
|
# Note: keep in sync with setuptools & pip
|
||||||
PYTHON3_VERSION_MAJOR:=3
|
PYTHON3_VERSION_MAJOR:=3
|
||||||
PYTHON3_VERSION_MINOR:=10
|
PYTHON3_VERSION_MINOR:=10
|
||||||
PYTHON3_VERSION_MICRO:=7
|
PYTHON3_VERSION_MICRO:=9
|
||||||
|
|
||||||
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
|
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
|
||||||
|
|
||||||
PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
|
PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
|
||||||
PYTHON3_PIP_PKG_RELEASE:=1
|
PYTHON3_PIP_PKG_RELEASE:=1
|
||||||
|
|
||||||
PYTHON3_SETUPTOOLS_VERSION:=63.2.0
|
PYTHON3_SETUPTOOLS_VERSION:=65.5.0
|
||||||
PYTHON3_PIP_VERSION:=22.2.2
|
PYTHON3_PIP_VERSION:=22.3.1
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
|
|||||||
|
|
||||||
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
|
||||||
PKG_HASH:=6eed8415b7516fb2f260906db5d48dd4c06acc0cb24a7d6cc15296a604dcdc48
|
PKG_HASH:=5ae03e308260164baba39921fdb4dbf8e6d03d8235a939d4582b33f0b5e46a83
|
||||||
|
|
||||||
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
||||||
PKG_LICENSE:=PSF-2.0
|
PKG_LICENSE:=PSF-2.0
|
||||||
|
|||||||
0
lang/python/python3/patches-pip/.gitkeep
Normal file
0
lang/python/python3/patches-pip/.gitkeep
Normal file
@@ -1,20 +0,0 @@
|
|||||||
diff --git a/pip/_vendor/pep517/in_process/__init__.py b/pip/_vendor/pep517/in_process/__init__.py
|
|
||||||
index c932313..a01143b 100644
|
|
||||||
--- a/pip/_vendor/pep517/in_process/__init__.py
|
|
||||||
+++ b/pip/_vendor/pep517/in_process/__init__.py
|
|
||||||
@@ -10,8 +10,13 @@ try:
|
|
||||||
import importlib.resources as resources
|
|
||||||
|
|
||||||
def _in_proc_script_path():
|
|
||||||
- return resources.path(__package__, '_in_process.py')
|
|
||||||
+ if resources.is_resource(__package__, '_in_process.py'):
|
|
||||||
+ return resources.path(__package__, '_in_process.py')
|
|
||||||
+ return resources.path(__package__, '_in_process.pyc')
|
|
||||||
except ImportError:
|
|
||||||
@contextmanager
|
|
||||||
def _in_proc_script_path():
|
|
||||||
- yield pjoin(dirname(abspath(__file__)), '_in_process.py')
|
|
||||||
+ _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.py')
|
|
||||||
+ if not os.path.isfile(_in_proc_script):
|
|
||||||
+ _in_proc_script = pjoin(dirname(abspath(__file__)), '_in_process.pyc')
|
|
||||||
+ yield _in_proc_script
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -15616,7 +15616,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
|
@@ -15617,7 +15617,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
|
||||||
$as_echo "$ABIFLAGS" >&6; }
|
$as_echo "$ABIFLAGS" >&6; }
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
|
||||||
$as_echo_n "checking SOABI... " >&6; }
|
$as_echo_n "checking SOABI... " >&6; }
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -4824,7 +4824,7 @@ AC_SUBST(SOABI)
|
@@ -4825,7 +4825,7 @@ AC_SUBST(SOABI)
|
||||||
AC_MSG_CHECKING(ABIFLAGS)
|
AC_MSG_CHECKING(ABIFLAGS)
|
||||||
AC_MSG_RESULT($ABIFLAGS)
|
AC_MSG_RESULT($ABIFLAGS)
|
||||||
AC_MSG_CHECKING(SOABI)
|
AC_MSG_CHECKING(SOABI)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
'_PYTHON_SYSCONFIGDATA_NAME',
|
'_PYTHON_SYSCONFIGDATA_NAME',
|
||||||
--- a/Makefile.pre.in
|
--- a/Makefile.pre.in
|
||||||
+++ b/Makefile.pre.in
|
+++ b/Makefile.pre.in
|
||||||
@@ -1593,7 +1593,7 @@ libinstall: build_all $(srcdir)/Modules/
|
@@ -1594,7 +1594,7 @@ libinstall: build_all $(srcdir)/Modules/
|
||||||
esac; \
|
esac; \
|
||||||
done; \
|
done; \
|
||||||
done
|
done
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
$(DESTDIR)$(LIBDEST); \
|
$(DESTDIR)$(LIBDEST); \
|
||||||
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
|
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
|
||||||
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
|
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
|
||||||
@@ -1751,7 +1751,7 @@ sharedinstall: sharedmods
|
@@ -1752,7 +1752,7 @@ sharedinstall: sharedmods
|
||||||
--install-scripts=$(BINDIR) \
|
--install-scripts=$(BINDIR) \
|
||||||
--install-platlib=$(DESTSHARED) \
|
--install-platlib=$(DESTSHARED) \
|
||||||
--root=$(DESTDIR)/
|
--root=$(DESTDIR)/
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
fi
|
fi
|
||||||
elif test "$cross_compiling" = maybe; then
|
elif test "$cross_compiling" = maybe; then
|
||||||
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
|
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
|
||||||
@@ -15686,7 +15686,7 @@ fi
|
@@ -15687,7 +15687,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
fi
|
fi
|
||||||
elif test "$cross_compiling" = maybe; then
|
elif test "$cross_compiling" = maybe; then
|
||||||
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
|
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
|
||||||
@@ -4882,7 +4882,7 @@ fi],
|
@@ -4883,7 +4883,7 @@ fi],
|
||||||
|
|
||||||
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
||||||
AC_SUBST(PY_ENABLE_SHARED)
|
AC_SUBST(PY_ENABLE_SHARED)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/Makefile.pre.in
|
--- a/Makefile.pre.in
|
||||||
+++ b/Makefile.pre.in
|
+++ b/Makefile.pre.in
|
||||||
@@ -1643,7 +1643,7 @@ python-config: $(srcdir)/Misc/python-con
|
@@ -1644,7 +1644,7 @@ python-config: $(srcdir)/Misc/python-con
|
||||||
@ # On Darwin, always use the python version of the script, the shell
|
@ # On Darwin, always use the python version of the script, the shell
|
||||||
@ # version doesn't use the compiler customizations that are provided
|
@ # version doesn't use the compiler customizations that are provided
|
||||||
@ # in python (_osx_support.py).
|
@ # in python (_osx_support.py).
|
||||||
|
|||||||
@@ -87,7 +87,7 @@
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4615,8 +4644,10 @@ static PyGetSetDef context_getsetlist[]
|
@@ -4619,8 +4648,10 @@ static PyGetSetDef context_getsetlist[]
|
||||||
(setter) set_minimum_version, NULL},
|
(setter) set_minimum_version, NULL},
|
||||||
{"maximum_version", (getter) get_maximum_version,
|
{"maximum_version", (getter) get_maximum_version,
|
||||||
(setter) set_maximum_version, NULL},
|
(setter) set_maximum_version, NULL},
|
||||||
|
|||||||
Reference in New Issue
Block a user