PR#9: F30: Update to 3.8.0a3 (fast-forward) - rpms/python38

rpms / python38

#9 F30: Update to 3.8.0a3 (fast-forward)

Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.

rpms/ churchyard/python38 a3 into f30

Temporarily skip test_asyncio to workaround bpo-35998

Miro Hrončok • 5 years ago

1361786

Update to 3.8.0a3

Miro Hrončok • 5 years ago

804ec7c

Add bootstrap bcond for Python 3.8

Miro Hrončok • 5 years ago

ad7d856

00102-lib64.patch

file modified

+31 -31

		`@@ -23,7 +23,7 @@`
		`index e07a6c8..554740d 100644`
		`--- a/Lib/distutils/sysconfig.py`
		`+++ b/Lib/distutils/sysconfig.py`
		`- @@ -129,8 +129,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):`
		`+ @@ -140,8 +140,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):`
		`prefix = plat_specific and EXEC_PREFIX or PREFIX`

		`if os.name == "posix":`
		`@@ -108,7 +108,7 @@`
		`index 266adf0..e8513b6 100644`
		`--- a/Lib/test/test_site.py`
		`+++ b/Lib/test/test_site.py`
		`- @@ -275,8 +275,8 @@ class HelperFunctionsTests(unittest.TestCase):`
		`+ @@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.TestCase):`
		`dirs = site.getsitepackages()`
		`if os.sep == '/':`
		`# OS X, Linux, FreeBSD, etc`
		`@@ -123,7 +123,7 @@`
		`index 59ba9d4..5780ed8 100644`
		`--- a/Makefile.pre.in`
		`+++ b/Makefile.pre.in`
		`- @@ -133,7 +133,7 @@ LIBDIR= @libdir@`
		`+ @@ -140,7 +140,7 @@ LIBDIR= @libdir@`
		`MANDIR= @mandir@`
		`INCLUDEDIR= @includedir@`
		`CONFINCLUDEDIR= $(exec_prefix)/include`
		`@@ -133,28 +133,28 @@`

		`# Detailed destination directories`
		`diff --git a/Modules/getpath.c b/Modules/getpath.c`
		`- index 85e737b..2a1fc79 100644`
		`+ index dd188c6..6e69eed 100644`
		`--- a/Modules/getpath.c`
		`+++ b/Modules/getpath.c`
		`- @@ -500,7 +500,7 @@ calculate_exec_prefix(const _PyCoreConfig *core_config,`
		`- "Could not find platform dependent libraries <exec_prefix>\n");`
		`+ @@ -688,7 +688,7 @@ calculate_exec_prefix(const _PyCoreConfig *core_config,`
		`+ if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) {`
		`+ return PATHLEN_ERR();`
		`+ }`
		`+ - err = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len);`
		`+ + err = joinpath(exec_prefix, L"lib64/lib-dynload", exec_prefix_len);`
		`+ if (_Py_INIT_FAILED(err)) {`
		`+ return err;`
		`+ }`
		`+ @@ -1015,7 +1015,7 @@ calculate_zip_path(PyCalculatePath calculate, const wchar_t prefix)`
		`+ return PATHLEN_ERR();`
		`}`
		`- wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN);`
		`- - joinpath(exec_prefix, L"lib/lib-dynload");`
		`- + joinpath(exec_prefix, L"lib64/lib-dynload");`
		`}`
		`- /* If we found EXEC_PREFIX do not reduce it! (Yet.) */`
		`- }`
		`- @@ -742,7 +742,7 @@ calculate_zip_path(PyCalculatePath calculate, const wchar_t prefix)`
		`- else {`
		`- wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN);`
		`+ - err = joinpath(calculate->zip_path, L"lib/python00.zip", zip_path_len);`
		`+ + err = joinpath(calculate->zip_path, L"lib64/python00.zip", zip_path_len);`
		`+ if (_Py_INIT_FAILED(err)) {`
		`+ return err;`
		`}`
		`- - joinpath(calculate->zip_path, L"lib/python00.zip");`
		`- + joinpath(calculate->zip_path, L"lib64/python00.zip");`
		`-`
		`- /* Replace "00" with version */`
		`- size_t bufsz = wcslen(calculate->zip_path);`
		`- @@ -867,7 +867,7 @@ calculate_init(PyCalculatePath *calculate,`
		`+ @@ -1144,7 +1144,7 @@ calculate_init(PyCalculatePath *calculate,`
		`if (!calculate->prefix) {`
		`return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);`
		`}`
		`@@ -164,29 +164,29 @@`
		`return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);`
		`}`
		`diff --git a/setup.py b/setup.py`
		`- index f1933f7..450cd8a 100644`
		`+ index 0258d3d..4b969bf 100644`
		`--- a/setup.py`
		`+++ b/setup.py`
		`- @@ -531,7 +531,7 @@ class PyBuildExt(build_ext):`
		`+ @@ -610,7 +610,7 @@ class PyBuildExt(build_ext):`
		`# directories (i.e. '.' and 'Include') must be first. See issue`
		`# 10520.`
		`- if not cross_compiling:`
		`+ if not CROSS_COMPILING:`
		`- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')`
		`+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')`
		`add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')`
		`# only change this for cross builds for 3.3, issues on Mageia`
		`- if cross_compiling:`
		`- @@ -830,11 +830,11 @@ class PyBuildExt(build_ext):`
		`+ if CROSS_COMPILING:`
		`+ @@ -902,11 +902,11 @@ class PyBuildExt(build_ext):`
		`elif curses_library:`
		`readline_libs.append(curses_library)`
		`- elif self.compiler.find_library_file(lib_dirs +`
		`+ elif self.compiler.find_library_file(self.lib_dirs +`
		`- ['/usr/lib/termcap'],`
		`+ ['/usr/lib64/termcap'],`
		`'termcap'):`
		`readline_libs.append('termcap')`
		`- exts.append( Extension('readline', ['readline.c'],`
		`- - library_dirs=['/usr/lib/termcap'],`
		`- + library_dirs=['/usr/lib64/termcap'],`
		`- extra_link_args=readline_extra_link_args,`
		`- libraries=readline_libs) )`
		`+ self.add(Extension('readline', ['readline.c'],`
		`+ - library_dirs=['/usr/lib/termcap'],`
		`+ + library_dirs=['/usr/lib64/termcap'],`
		`+ extra_link_args=readline_extra_link_args,`
		`+ libraries=readline_libs))`
		`else:`

00189-use-rpm-wheels.patch

file modified

+2 -2

		`@@ -16,9 +16,9 @@`

		`+_WHEEL_DIR = "/usr/share/python-wheels/"`

		`- -_SETUPTOOLS_VERSION = "40.6.2"`
		`+ -_SETUPTOOLS_VERSION = "40.8.0"`

		`- -_PIP_VERSION = "18.1"`
		`+ -_PIP_VERSION = "19.0.3"`
		`+def _get_most_recent_wheel_version(pkg):`
		`+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))`
		`+ suffix = "-py2.py3-none-any.whl"`

python38.spec

file modified

+26 -10

		`@@ -14,7 +14,7 @@`
		`# WARNING When rebasing to a new Python version,`
		`# remember to update the python3-docs package as well`
		`%global general_version %{pybasever}.0`
		`- %global prerel a2`
		`+ %global prerel a3`
		`%global upstream_version %{general_version}%{?prerel}`
		`Version: %{general_version}%{?prerel:~%{prerel}}`
		`Release: 1%{?dist}`
		`@@ -36,6 +36,17 @@`
		`# WARNING: This does not change the package name and summary above`
		`%bcond_without flatpackage`

		`+ # When bootstrapping python3, we need to build setuptools.`
		`+ # but setuptools BR python3-devel and that brings in python3-rpm-generators;`
		`+ # python3-rpm-generators needs python3-setuptools, so we cannot have it yet.`
		`+ #`
		`+ # Procedure: https://fedoraproject.org/wiki/SIGs/Python/UpgradingPython`
		`+ #`
		`+ # IMPORTANT: When bootstrapping, it's very likely the wheels for pip and`
		`+ # setuptools are not available. Turn off the rpmwheels bcond until`
		`+ # the two packages are built with wheels to get around the issue.`
		`+ %bcond_with bootstrap`
		`+`
		`# Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package`
		`# Uses upstream bundled prebuilt wheels otherwise`
		`%bcond_without rpmwheels`
		`@@ -77,10 +88,6 @@`
		`%endif`


		`- # Notes from bootstraping Python 3.7:`
		`- # https://fedoraproject.org/wiki/SIGs/Python/UpgradingPython`
		`-`
		`-`
		`# =====================`
		`# General global macros`
		`# =====================`
		`@@ -372,8 +379,8 @@`
		`Requires: python-setuptools-wheel`
		`Requires: python-pip-wheel`
		`%else`
		`- Provides: bundled(python3-pip) = 18.1`
		`- Provides: bundled(python3-setuptools) = 40.6.2`
		`+ Provides: bundled(python3-pip) = 19.0.3`
		`+ Provides: bundled(python3-setuptools) = 40.8.0`
		`%endif`

		`# There are files in the standard library that have python shebang.`
		`@@ -396,8 +403,8 @@`
		`BuildRequires: python-rpm-macros`
		`Requires: python-rpm-macros`
		`Requires: python3-rpm-macros`
		`- Requires: python3-rpm-generators`

		`+ %if %{without bootstrap}`
		`# This is not "API" (packages that need setuptools should still BuildRequire it)`
		`# However some packages apparently can build both with and without setuptools`
		`# producing egg-info as file or directory (depending on setuptools presence).`
		`@@ -407,6 +414,9 @@`
		`# See https://fedoraproject.org/wiki/Packaging:Directory_Replacement`
		`Requires: python3-setuptools`

		`+ Requires: python3-rpm-generators`
		`+ %endif`
		`+`
		`Provides: %{name}-2to3 = %{version}-%{release}`
		`Provides: 2to3 = %{version}-%{release}`

		`@@ -511,8 +521,8 @@`
		`Requires: python-setuptools-wheel`
		`Requires: python-pip-wheel`
		`%else`
		`- Provides: bundled(python3-pip) = 18.1`
		`- Provides: bundled(python3-setuptools) = 40.6.2`
		`+ Provides: bundled(python3-pip) = 19.0.3`
		`+ Provides: bundled(python3-setuptools) = 40.8.0`
		`%endif`

		`# The description for the flat package`
		`@@ -968,6 +978,8 @@`
		`# our non-standard decorators take effect on the relevant tests:`
		`# @unittest._skipInRpmBuild(reason)`
		`# @unittest._expectedFailureInRpmBuild`
		`+ # test_asyncio skipped:`
		`+ # https://bugs.python.org/issue35998`
		`WITHIN_PYTHON_RPM_BUILD= \`
		`LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \`
		`-wW --slowest -j0 \`
		`@@ -980,6 +992,7 @@`
		`%ifarch ppc64le`
		`-x test_buffer \`
		`%endif`
		`+ -x test_asyncio \`

		`echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName`

		`@@ -1479,6 +1492,9 @@`
		`# ======================================================`

		`%changelog`
		`+ * Tue Mar 26 2019 Miro Hrončok <mhroncok@redhat.com> - 3.8.0~a3-1`
		`+ - Update to 3.8.0a3`
		`+`
		`* Mon Feb 25 2019 Miro Hrončok <mhroncok@redhat.com> - 3.8.0~a2-1`
		`- Update to 3.8.0a2`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (Python-3.8.0a2.tar.xz) = ebba962aa73bf690f33f4e2183da5f64f13cdd892d94c48b433cd04f7cdbc8baf88ff60d7998c330683b590f7c02fa2f426c9cbde461f36871bda728ab4f07ac`
		`+ SHA512 (Python-3.8.0a3.tar.xz) = 2348416c3118d1ff6b88b1ee823046de6a26305c10dd900fcb59fbc5b37a8f54db7afcd2f8e7c927c50c4f317a8c20370478030f996f93c63381d2167247e6fd`

no initial comment

churchyard commented 5 years ago

======================================================================
ERROR: test_scrypt (test.test_hashlib.KDFTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib64/python3.8/test/test_hashlib.py", line 941, in test_scrypt
    result = hashlib.scrypt(password, salt=salt, n=n, r=r, p=p)
ValueError: Invalid parameter combination for n, r, p, maxmem.

----------------------------------------------------------------------

Still the openssl update in testing, CI's good.