Commit a5dcdf37 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

python3: bump to version 3.4.1 



A few minor updates on the patches were needed to resolve some
conflicts on the main Makefile.pre.in file, in the list of modules to
build/install.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 63c735b6

package/python3/python3-003-sysconfigdata-install-location.patch

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ Index: b/Makefile.pre.in 
 	@for d in $(LIBSUBDIRS); \

 	do \

 		a=$(srcdir)/Lib/$$d; \

@@ -1513,7 +1521,7 @@

@@ -1514,7 +1522,7 @@

 	find build -name 'fficonfig.h' -exec rm -f {} ';' || true

 	find build -name '*.py' -exec rm -f {} ';' || true

 	find build -name '*.py[co]' -exec rm -f {} ';' || true

package/python3/python3-006-cross-compile-getaddrinfo.patch

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -3423,7 +3423,7 @@

@@ -3412,7 +3412,7 @@

 

 AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)

package/python3/python3-007-disable-extensions.patch

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -2360,6 +2360,8 @@

@@ -2349,6 +2349,8 @@

 

 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])

package/python3/python3-100-optional-test-modules.patch

+11 −9
Original line number Diff line number Diff line
@@ -42,16 +42,16 @@ Index: b/Makefile.pre.in 
+		curses pydoc_data $(MACHDEPS)

+

+TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \

+		test test/test_asyncio ctypes/test \

+		test test/test_asyncio \

+		test/test_email test/test_email/data \

+		test/test_json \

 		test/audiodata \

 		test/capath test/data \

 		test/cjkencodings test/decimaltestdata test/xmltestdata \

@@ -1148,28 +1170,20 @@

 		test/namespace_pkgs/project3/parent/child \

                 test/namespace_pkgs/module_and_namespace_package \

                 test/namespace_pkgs/module_and_namespace_package/a_test \

@@ -1148,28 +1170,22 @@

 		test/test_importlib/namespace_pkgs/project3/parent/child \

                 test/test_importlib/namespace_pkgs/module_and_namespace_package \

                 test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \

-		asyncio \

-		test/test_asyncio \

-		collections concurrent concurrent/futures encodings \
@@ -61,6 +61,7 @@ Index: b/Makefile.pre.in 
-		sqlite3 sqlite3/test \

-		logging csv wsgiref urllib \

-		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \

+		sqlite3/test \

+		lib2to3/tests \

 		lib2to3/tests/data lib2to3/tests/data/fixers \

 		lib2to3/tests/data/fixers/myfixes \
@@ -68,7 +69,9 @@ Index: b/Makefile.pre.in 
-		idlelib idlelib/Icons idlelib/idle_test \

-		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \

-		importlib test/test_importlib test/test_importlib/builtin \

+		sqlite3/test idlelib/idle_test \

+		ctypes/test \

+		idlelib/idle_test \

+		distutils/tests \

+		test/test_importlib test/test_importlib/builtin \

 		test/test_importlib/extension test/test_importlib/frozen \

 		test/test_importlib/import_ test/test_importlib/source \
@@ -77,8 +80,7 @@ Index: b/Makefile.pre.in 
-		unittest unittest/test unittest/test/testmock \

-		venv venv/scripts venv/scripts/posix \

-		curses pydoc_data $(MACHDEPS)

+		unittest/test unittest/test/testmock \

+		distutils/tests

+		unittest/test unittest/test/testmock

+

+ifeq (@TEST_MODULES@,yes)

+LIBSUBDIRS += $(TESTSUBDIRS)
@@ -91,7 +93,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -2667,6 +2667,12 @@

@@ -2656,6 +2656,12 @@

 fi

package/python3/python3-101-optional-pydoc.patch

+7 −7
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ Index: b/Makefile.pre.in 
+		curses $(MACHDEPS)

 

 TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \

 		test test/test_asyncio ctypes/test \

@@ -1180,6 +1182,10 @@

 		unittest/test unittest/test/testmock \

 		distutils/tests

 		test test/test_asyncio \

@@ -1182,6 +1184,10 @@

 		test/test_importlib/import_ test/test_importlib/source \

 		unittest/test unittest/test/testmock

 

+ifeq (@PYDOC@,yes)

+LIBSUBDIRS += pydoc_data
@@ -50,7 +50,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -2666,6 +2666,11 @@

@@ -2655,6 +2655,11 @@

       AC_CHECK_FUNCS(pthread_atfork)

 fi
@@ -66,7 +66,7 @@ Index: b/setup.py 
===================================================================

--- a/setup.py

+++ b/setup.py

@@ -2182,6 +2182,12 @@

@@ -2203,6 +2203,12 @@

     # turn off warnings when deprecated modules are imported

     import warnings

     warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -79,7 +79,7 @@ Index: b/setup.py 
     setup(# PyPI Metadata (PEP 301)

           name = "Python",

           version = sys.version.split()[0],

@@ -2206,8 +2212,7 @@

@@ -2227,8 +2233,7 @@

           # If you change the scripts installed here, you also need to

           # check the PyBuildScripts command above, and change the links

           # created by the bininstall target in Makefile.pre.in