Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r98390:69267325e0a5
Date: 2019-12-24 21:13 +0200
http://bitbucket.org/pypy/pypy/changeset/69267325e0a5/
Log: merge default into py3.6
diff --git a/pypy/tool/build_cffi_imports.py
b/lib_pypy/tools/build_cffi_imports.py
rename from pypy/tool/build_cffi_imports.py
rename to lib_pypy/tools/build_cffi_imports.py
diff --git a/pypy/doc/build.rst b/pypy/doc/build.rst
--- a/pypy/doc/build.rst
+++ b/pypy/doc/build.rst
@@ -226,7 +226,7 @@
command::
cd pypy/goal
- PYTHONPATH=../.. ./pypy-c ../tool/build_cffi_imports.py
+ PYTHONPATH=../.. ./pypy-c ../../lib_pypy/tools/build_cffi_imports.py
.. _`out-of-line API mode`:
http://cffi.readthedocs.org/en/latest/overview.html#real-example-api-level-out-of-line
diff --git a/pypy/doc/release-v7.3.0.rst b/pypy/doc/release-v7.3.0.rst
--- a/pypy/doc/release-v7.3.0.rst
+++ b/pypy/doc/release-v7.3.0.rst
@@ -18,7 +18,7 @@
building third party packages for python, so this release changes the ABI tag
for PyPy.
-Based on the great work done in `portable-pypy`_, the linux downloads we
+Based on the great work done in `portable-pypy`_, the linux x86 downloads we
provide are now built on top of the `manylinux2010`_ CentOS6 docker image.
The tarballs include the needed shared objects to run on any platform that
supports manylinux2010 wheels, which should include all supported versions of
@@ -57,6 +57,11 @@
previous release, we have accepted contributions from 3 new contributors,
thanks for pitching in.
+If you are a python library maintainer and use c-extensions, please consider
+making a cffi / cppyy version of your library that would be performant on PyPy.
+If you are stuck with using the C-API, you can use `docker images`_ with PyPy
+built in or the `multibuild system`_ to build wheels.
+
.. _`PyPy`: index.html
.. _`RPython`: https://rpython.readthedocs.org
.. _`help`: project-ideas.html
@@ -64,6 +69,8 @@
.. _`cppyy`: https://cppyy.readthedocs.io
.. _`available as wheels`: https://github.com/antocuni/pypy-wheels
.. _`portable-pypy`: https://github.com/squeaky-pl/portable-pypy
+.. _`docker images`: https://github.com/pypy/manylinux
+.. _`multibuild system`: https://github.com/matthew-brett/multibuild
.. _`manylinux2010`: https://github.com/pypa/manylinux
What is PyPy?
@@ -116,7 +123,7 @@
* Fix up LICENSE file
* Turn all ``http`` links in the documentation to ``https``
* Update the bndled pip and setuptools (used in ``pypy -mensurepip`` to version
- that support `manylinux2010`_ wheels
+ that support manylinux2010 wheels
* Link the ``DEFAULT_SOABI`` to the ``PYPY_VERSION``
* Workaround for programs calling ``sys.setrecursionlimit(huge_value)`` (`issue
3094`_)
@@ -149,7 +156,7 @@
* Add ``_PySet_Next``, ``_PySet_NextEntry``
* Correctly swallow exceptions happening inside ``PyDict_GetItem()`` (`issue
3098`_)
-* Respect tp_dict on PyType_Ready (`issue XXX`_)
+* Respect tp_dict on PyType_Ready
* Allow calling ``PyType_Ready`` on a subclass with a partially built
``tp_base`` (issue 3117`_)
* Rename ``tuple_new`` to ``_PyPy_tuple_new`` to follow the naming convention
of
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -91,7 +91,8 @@
set PYPY_GC_MAX_DELTA=200MB
pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit
targetpypystandalone
set PYPY_GC_MAX_DELTA=
- PYTHONPATH=../.. ./pypy-c ../tool/build_cffi_imports.py
+ # This is done as part of translation
+ PYTHONPATH=../.. ./pypy-c ../../lib_pypy/tools/build_cffi_imports.py
.. _build instructions: http://pypy.org/download.html#building-from-source
diff --git a/pypy/goal/targetpypystandalone.py
b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -368,7 +368,8 @@
@taskdef([compile_goal], "Create cffi bindings for modules")
def task_build_cffi_imports(self):
''' Use cffi to compile cffi interfaces to modules'''
- filename = os.path.join(pypydir, 'tool', 'build_cffi_imports.py')
+ filename = os.path.join(pypydir, '..', 'lib_pypy', 'tools',
+ 'build_cffi_imports.py')
if sys.platform == 'darwin':
argv = [filename, '--embed-dependencies']
else:
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -479,11 +479,12 @@
exename = self.c_entryp
newexename = mkexename(self.compute_exe_name())
shutil_copy(str(exename), str(newexename))
+ self.log.info("copied: %s to %s" % (exename, newexename,))
if self.cbuilder.shared_library_name is not None:
soname = self.cbuilder.shared_library_name
newsoname = newexename.new(basename=soname.basename)
shutil_copy(str(soname), str(newsoname))
- self.log.info("copied: %s" % (newsoname,))
+ self.log.info("copied: %s to %s" % (soname, newsoname,))
if sys.platform == 'win32':
# Copy pypyw.exe
newexename = mkexename(self.compute_exe_name(suffix='w'))
diff --git a/testrunner/lib_python_tests.py b/testrunner/lib_python_tests.py
--- a/testrunner/lib_python_tests.py
+++ b/testrunner/lib_python_tests.py
@@ -19,7 +19,7 @@
popen = subprocess.Popen(
[sys.executable, "pypy/test_all.py",
pypyopt,
- "--timeout=3600",
+ "--timeout=1324", # make it easy to search for
"-rs",
"--duration=10",
"--resultlog=cpython.log", "lib-python",
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
