[arch-commits] Commit in python/repos (5 files)
Jan Steffens
heftig at archlinux.org
Sat Sep 15 20:13:18 UTC 2018
Date: Saturday, September 15, 2018 @ 20:13:17
Author: heftig
Revision: 334635
archrelease: copy trunk to testing-x86_64
Added:
python/repos/testing-x86_64/
python/repos/testing-x86_64/0001-compileall-Fix-ddir-when-recursing.patch
(from rev 334634, python/trunk/0001-compileall-Fix-ddir-when-recursing.patch)
python/repos/testing-x86_64/PKGBUILD
(from rev 334634, python/trunk/PKGBUILD)
python/repos/testing-x86_64/bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch
(from rev 334634, python/trunk/bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch)
python/repos/testing-x86_64/dont-make-libpython-readonly.patch
(from rev 334634, python/trunk/dont-make-libpython-readonly.patch)
-----------------------------------------------------------------+
0001-compileall-Fix-ddir-when-recursing.patch | 57 ++++
PKGBUILD | 137 ++++++++++
bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch | 83 ++++++
dont-make-libpython-readonly.patch | 13
4 files changed, 290 insertions(+)
Copied: python/repos/testing-x86_64/0001-compileall-Fix-ddir-when-recursing.patch (from rev 334634, python/trunk/0001-compileall-Fix-ddir-when-recursing.patch)
===================================================================
--- testing-x86_64/0001-compileall-Fix-ddir-when-recursing.patch (rev 0)
+++ testing-x86_64/0001-compileall-Fix-ddir-when-recursing.patch 2018-09-15 20:13:17 UTC (rev 334635)
@@ -0,0 +1,57 @@
+From 84fdbc156ed424d030686de350fbfc6c3593263f Mon Sep 17 00:00:00 2001
+Message-Id: <84fdbc156ed424d030686de350fbfc6c3593263f.1537028533.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sat, 15 Sep 2018 18:22:06 +0200
+Subject: [PATCH] compileall: Fix ddir when recursing
+
+---
+ Lib/compileall.py | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/Lib/compileall.py b/Lib/compileall.py
+index 72592126d7..70e246fd96 100644
+--- a/Lib/compileall.py
++++ b/Lib/compileall.py
+@@ -45,12 +45,16 @@ def _walk_dir(dir, ddir=None, maxlevels=10, quiet=0):
+ else:
+ dfile = None
+ if not os.path.isdir(fullname):
+- yield fullname
++ yield fullname, ddir
+ elif (maxlevels > 0 and name != os.curdir and name != os.pardir and
+ os.path.isdir(fullname) and not os.path.islink(fullname)):
+ yield from _walk_dir(fullname, ddir=dfile,
+ maxlevels=maxlevels - 1, quiet=quiet)
+
++def _compile_one(file_ddir, *args, **kwargs):
++ file, ddir = file_ddir
++ return compile_file(file, ddir, *args, **kwargs)
++
+ def compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None,
+ quiet=0, legacy=False, optimize=-1, workers=1,
+ invalidation_mode=py_compile.PycInvalidationMode.TIMESTAMP):
+@@ -79,17 +83,17 @@ def compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None,
+ if workers is not None and workers != 1 and ProcessPoolExecutor is not None:
+ workers = workers or None
+ with ProcessPoolExecutor(max_workers=workers) as executor:
+- results = executor.map(partial(compile_file,
+- ddir=ddir, force=force,
++ results = executor.map(partial(_compile_one,
++ force=force,
+ rx=rx, quiet=quiet,
+ legacy=legacy,
+ optimize=optimize,
+ invalidation_mode=invalidation_mode),
+ files)
+ success = min(results, default=True)
+ else:
+- for file in files:
+- if not compile_file(file, ddir, force, rx, quiet,
++ for file_ddir in files:
++ if not _compile_one(file_ddir, force, rx, quiet,
+ legacy, optimize, invalidation_mode):
+ success = False
+ return success
+--
+2.18.0
+
Copied: python/repos/testing-x86_64/PKGBUILD (from rev 334634, python/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-09-15 20:13:17 UTC (rev 334635)
@@ -0,0 +1,137 @@
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+pkgname=python
+pkgver=3.7.0
+pkgrel=4
+_pybasever=${pkgver%.*}
+pkgdesc="Next generation of the python high-level scripting language"
+arch=('x86_64')
+license=('custom')
+url="http://www.python.org/"
+depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'libnsl')
+makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb')
+optdepends=('python-setuptools'
+ 'python-pip'
+ 'sqlite'
+ 'mpdecimal: for decimal'
+ 'xz: for lzma'
+ 'tk: for tkinter')
+provides=('python3')
+replaces=('python3')
+source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
+ bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch
+ dont-make-libpython-readonly.patch
+ 0001-compileall-Fix-ddir-when-recursing.patch)
+sha512sums=('8bb11233fb67ee9ab8ed1b72f8fdc62f66e26a6beaaeb92448bce681cf065269833b1658d3ed2459127f25ba43adb0eab73cf27c59834a2a803fb529b4216739'
+ 'SKIP'
+ '0ec544fa95ba30be03e866d02848f9fa4921304055368609136ac39626df9835bad75506f6d81ef9fdc0ebcc29a9749f84b5b5f4dd75958c9699ade522d51b68'
+ '2ef96708d5b13ae2a3d2cc62c87b4780e60ecfce914e190564492def3a11d5e56977659f41c7f9d12266e58050c766bce4e2b5d50b708eb792794fa8357920c4'
+ 'ebd04c3b6d41321b1f0d439d356e0ce463760db55dc64109854c70d017cf56608aa19de9fc4a21bf840795ff202b4703444f9af8074b661780798c17e03089ff')
+validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D') # Ned Deily (Python release signing key) <nad at python.org>
+
+prepare() {
+ cd Python-${pkgver}
+
+ # https://bugs.python.org/issue34056
+ patch -Np1 -i ../bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch
+
+ # FS#45809
+ patch -p1 -i ../dont-make-libpython-readonly.patch
+
+ # FS#59997
+ patch -p1 -i ../0001-compileall-Fix-ddir-when-recursing.patch
+
+ # https://bugs.python.org/issue34587
+ sed -i -e "s|testCongestion|disabled_&|" Lib/test/test_socket.py
+
+ # FS#23997
+ sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
+
+ # Speed up LTO
+ sed -i -e "s|-flto |-flto=4 |g" configure configure.ac
+
+ # Ensure that we are using the system copy of various libraries (expat, libffi, and libmpdec),
+ # rather than copies shipped in the tarball
+ rm -r Modules/expat
+ rm -r Modules/_ctypes/{darwin,libffi}*
+ rm -r Modules/_decimal/libmpdec
+}
+
+build() {
+ cd Python-${pkgver}
+
+ # PGO should be done with -O3
+ CFLAGS="${CFLAGS/-O2/-O3}"
+
+ # Disable bundled pip & setuptools
+ ./configure --prefix=/usr \
+ --enable-shared \
+ --with-threads \
+ --with-computed-gotos \
+ --enable-optimizations \
+ --with-lto \
+ --enable-ipv6 \
+ --with-system-expat \
+ --with-dbmliborder=gdbm:ndbm \
+ --with-system-ffi \
+ --with-system-libmpdec \
+ --enable-loadable-sqlite-extensions \
+ --without-ensurepip
+
+ # Obtain next free server number for xvfb-run; this even works in a chroot environment.
+ export servernum=99
+ while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
+
+ LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1280x720x24 -ac +extension GLX" -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
+}
+
+check() {
+ # test_gdb is expected to fail with LTO
+ # test_idle, test_tk, test_ttk_guionly segfaults since 3.6.5
+
+ # https://bugs.python.org/issue34022
+ # test_cmd_line_script, test_compileall, test_importlib,
+ # test_multiprocessing_main_handling, test_py_compile, test_runpy
+
+ cd Python-${pkgver}
+
+ # Obtain next free server number for xvfb-run; this even works in a chroot environment.
+ export servernum=99
+ while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
+
+ LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+ LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1280x720x24 -ac +extension GLX" -a -n "$servernum" \
+ "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_gdb -x test_idle -x test_tk -x test_ttk_guionly \
+ -x test_cmd_line_script -x test_compileall -x test_importlib -x test_multiprocessing_main_handling -x test_py_compile -x test_runpy
+}
+
+package() {
+ cd Python-${pkgver}
+
+ # Hack to avoid building again
+ sed -i 's/^all:.*$/all: build_all/' Makefile
+
+ # PGO should be done with -O3
+ CFLAGS="${CFLAGS/-O2/-O3}"
+
+ make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" install
+
+ # Why are these not done by default...
+ ln -s python3 "${pkgdir}"/usr/bin/python
+ ln -s python3-config "${pkgdir}"/usr/bin/python-config
+ ln -s idle3 "${pkgdir}"/usr/bin/idle
+ ln -s pydoc3 "${pkgdir}"/usr/bin/pydoc
+ ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1
+
+ # some useful "stuff" FS#46146
+ install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+ install -m755 Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/
+ install -m755 Tools/scripts/{README,*py} "${pkgdir}"/usr/lib/python${_pybasever}/Tools/scripts/
+
+ # License
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Copied: python/repos/testing-x86_64/bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch (from rev 334634, python/trunk/bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch)
===================================================================
--- testing-x86_64/bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch (rev 0)
+++ testing-x86_64/bpo34056-always-return-bytes-from-_HackedGetData.get_data.patch 2018-09-15 20:13:17 UTC (rev 334635)
@@ -0,0 +1,83 @@
+From 7bd6f0e5500f778e940374237b94651f60ae1990 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <31488909+miss-islington at users.noreply.github.com>
+Date: Fri, 6 Jul 2018 21:00:45 -0700
+Subject: [PATCH] closes bpo-34056: Always return bytes from
+ _HackedGetData.get_data(). (GH-8130)
+
+* Always return bytes from _HackedGetData.get_data().
+
+Ensure the imp.load_source shim always returns bytes by reopening the file in
+binary mode if needed. Hash-based pycs have to receive the source code in bytes.
+
+It's tempting to change imp.get_suffixes() to always return 'rb' as a mode, but
+that breaks some stdlib tests and likely 3rdparty code, too.
+(cherry picked from commit b0274f2cddd36b49fe5080efbe160277ef546471)
+
+Co-authored-by: Benjamin Peterson <benjamin at python.org>
+---
+ Lib/imp.py | 13 ++++++-------
+ Lib/test/test_imp.py | 15 +++++++++++++++
+ 2 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/Lib/imp.py b/Lib/imp.py
+index 866464b245b2..31f8c766381a 100644
+--- a/Lib/imp.py
++++ b/Lib/imp.py
+@@ -142,17 +142,16 @@ def __init__(self, fullname, path, file=None):
+ def get_data(self, path):
+ """Gross hack to contort loader to deal w/ load_*()'s bad API."""
+ if self.file and path == self.path:
++ # The contract of get_data() requires us to return bytes. Reopen the
++ # file in binary mode if needed.
+ if not self.file.closed:
+ file = self.file
+- else:
+- self.file = file = open(self.path, 'r')
++ if 'b' not in file.mode:
++ file.close()
++ if self.file.closed:
++ self.file = file = open(self.path, 'rb')
+
+ with file:
+- # Technically should be returning bytes, but
+- # SourceLoader.get_code() just passed what is returned to
+- # compile() which can handle str. And converting to bytes would
+- # require figuring out the encoding to decode to and
+- # tokenize.detect_encoding() only accepts bytes.
+ return file.read()
+ else:
+ return super().get_data(path)
+diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
+index a115e60d4e4f..bb0144b12d41 100644
+--- a/Lib/test/test_imp.py
++++ b/Lib/test/test_imp.py
+@@ -2,6 +2,7 @@
+ import importlib.util
+ import os
+ import os.path
++import py_compile
+ import sys
+ from test import support
+ from test.support import script_helper
+@@ -350,6 +351,20 @@ def test_pyc_invalidation_mode_from_cmdline(self):
+ res = script_helper.assert_python_ok(*args)
+ self.assertEqual(res.out.strip().decode('utf-8'), expected)
+
++ def test_find_and_load_checked_pyc(self):
++ # issue 34056
++ with support.temp_cwd():
++ with open('mymod.py', 'wb') as fp:
++ fp.write(b'x = 42\n')
++ py_compile.compile(
++ 'mymod.py',
++ doraise=True,
++ invalidation_mode=py_compile.PycInvalidationMode.CHECKED_HASH,
++ )
++ file, path, description = imp.find_module('mymod', path=['.'])
++ mod = imp.load_module('mymod', file, path, description)
++ self.assertEqual(mod.x, 42)
++
+
+ class ReloadTests(unittest.TestCase):
+
Copied: python/repos/testing-x86_64/dont-make-libpython-readonly.patch (from rev 334634, python/trunk/dont-make-libpython-readonly.patch)
===================================================================
--- testing-x86_64/dont-make-libpython-readonly.patch (rev 0)
+++ testing-x86_64/dont-make-libpython-readonly.patch 2018-09-15 20:13:17 UTC (rev 334635)
@@ -0,0 +1,13 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index ce2c0aa..7d6dcf7 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -60,7 +60,7 @@ INSTALL_DATA= @INSTALL_DATA@
+ # Shared libraries must be installed with executable mode on some systems;
+ # rather than figuring out exactly which, we always give them executable mode.
+ # Also, making them read-only seems to be a good idea...
+-INSTALL_SHARED= ${INSTALL} -m 555
++INSTALL_SHARED= ${INSTALL} -m 755
+
+ MKDIR_P= @MKDIR_P@
+
More information about the arch-commits
mailing list