Author: Antonio Cuni <anto.c...@gmail.com>
Branch:
Changeset: r65317:ac701565be25
Date: 2013-07-10 16:01 +0200
http://bitbucket.org/pypy/pypy/changeset/ac701565be25/
Log: merge heads
diff --git a/pypy/doc/release-2.1.0-beta1.rst b/pypy/doc/release-2.1.0-beta1.rst
--- a/pypy/doc/release-2.1.0-beta1.rst
+++ b/pypy/doc/release-2.1.0-beta1.rst
@@ -18,16 +18,20 @@
==========
* Bugfixes to the ARM JIT backend, so that ARM is now an officially
- supported processor architecture.
+ supported processor architecture
-* Various numpy improvements.
+* Stacklet support on ARM
-* Bugfixes to cffi and ctypes.
+* Various numpy improvements
+
+* Bugfixes to cffi and ctypes
* Bugfixes to the stacklet support
* Improved logging performance
+* Faster sets for objects
+
What is PyPy?
=============
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -2,77 +2,6 @@
What's new in PyPy 2.1
======================
-.. this is a revision shortly after release-2.0
-.. startrev: a13c07067613
+.. this is a revision shortly after release-2.1-beta
+.. startrev: 4eb52818e7c0
-.. branch: ndarray-ptp
-put and array.put
-
-.. branch: numpy-pickle
-Pickling of numpy arrays and dtypes (including record dtypes)
-
-.. branch: remove-array-smm
-Remove multimethods in the arraymodule
-
-.. branch: callback-stacklet
-Fixed bug when switching stacklets from a C callback
-
-.. branch: remove-set-smm
-Remove multi-methods on sets
-
-.. branch: numpy-subarrays
-Implement subarrays for numpy
-
-.. branch: remove-dict-smm
-Remove multi-methods on dict
-
-.. branch: remove-list-smm-2
-Remove remaining multi-methods on list
-
-.. branch: arm-stacklet
-Stacklet support for ARM, enables _continuation support
-
-.. branch: remove-tuple-smm
-Remove multi-methods on tuple
-
-.. branch: remove-iter-smm
-Remove multi-methods on iterators
-
-.. branch: emit-call-x86
-.. branch: emit-call-arm
-
-.. branch: on-abort-resops
-Added list of resops to the pypyjit on_abort hook.
-
-.. branch: logging-perf
-Speeds up the stdlib logging module
-
-.. branch: operrfmt-NT
-Adds a couple convenient format specifiers to operationerrfmt
-
-.. branch: win32-fixes3
-Skip and fix some non-translated (own) tests for win32 builds
-
-.. branch: ctypes-byref
-Add the '_obj' attribute on ctypes pointer() and byref() objects
-
-.. branch: argsort-segfault
-Fix a segfault in argsort when sorting by chunks on multidim numpypy arrays
(mikefc)
-
-.. branch: dtype-isnative
-.. branch: ndarray-round
-
-.. branch: faster-str-of-bigint
-Improve performance of str(long).
-
-.. branch: ndarray-view
-Add view to ndarray and zeroD arrays, not on dtype scalars yet
-
-.. branch: numpypy-segfault
-fix segfault caused by iterating over empty ndarrays
-
-.. branch: identity-set
-Faster sets for objects
-
-.. branch: inline-identityhash
-Inline the fast path of id() and hash()
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -548,10 +548,10 @@
log = self.run(f, import_site=True)
loop, = log.loops_by_id('ntohs')
assert loop.match_by_id('ntohs', """
- guard_not_invalidated(descr=...)
p12 = call(ConstClass(ntohs), 1, descr=...)
guard_no_exception(descr=...)
- """)
+ """,
+ include_guard_not_invalidated=False)
#
py.test.raises(InvalidMatch, loop.match_by_id, 'ntohs', """
guard_not_invalidated(descr=...)
diff --git a/pypy/module/pypyjit/test_pypy_c/test_array.py
b/pypy/module/pypyjit/test_pypy_c/test_array.py
--- a/pypy/module/pypyjit/test_pypy_c/test_array.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_array.py
@@ -105,7 +105,6 @@
assert loop.match("""
i10 = int_lt(i6, 1000)
guard_true(i10, descr=...)
- guard_not_invalidated?
i11 = int_lt(i6, i7)
guard_true(i11, descr=...)
f13 = getarrayitem_raw(i8, i6, descr=<ArrayF 8>)
@@ -117,7 +116,7 @@
i20 = int_add(i6, 1)
--TICK--
jump(..., descr=...)
- """)
+ """, ignore_ops=['guard_not_invalidated'])
def test_array_of_floats(self):
try:
@@ -142,7 +141,6 @@
assert loop.match("""
i10 = int_lt(i6, 1000)
guard_true(i10, descr=...)
- guard_not_invalidated?
i11 = int_lt(i6, i7)
guard_true(i11, descr=...)
i13 = getarrayitem_raw(i8, i6, descr=<Array. 4>)
@@ -157,7 +155,7 @@
i23 = int_add(i6, 1)
--TICK--
jump(..., descr=...)
- """)
+ """, ignore_ops=['guard_not_invalidated'])
def test_zeropadded(self):
diff --git a/rpython/jit/backend/arm/test/conftest.py
b/rpython/jit/backend/arm/test/conftest.py
--- a/rpython/jit/backend/arm/test/conftest.py
+++ b/rpython/jit/backend/arm/test/conftest.py
@@ -16,5 +16,7 @@
dest="run_translation_tests",
help="run tests that translate code")
-def pytest_ignore_collect(path, config):
- return not cpu.startswith('arm')
+def pytest_collect_directory(path, parent):
+ if not cpu.startswith('arm'):
+ py.test.skip("ARM(v7) tests skipped: cpu is %r" % (cpu,))
+pytest_collect_file = pytest_collect_directory
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
