[pypy-commit] extradoc extradoc: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r5398:347ebc4365d2
Date: 2014-09-13 18:05 +0200
http://bitbucket.org/pypy/extradoc/changeset/347ebc4365d2/

Log:	merge heads

diff --git a/talk/pycon2015/status/abstract.rst b/talk/pycon2015/status/abstract.rst
--- a/talk/pycon2015/status/abstract.rst
+++ b/talk/pycon2015/status/abstract.rst
@@ -1,28 +1,32 @@
-Status of PyPy and its ecosystem
-================================
+PyPy - the last 2 years of progress
+===================================
 
-Description
------------
+Description (one paragraph, 400 chars max)
+------------------------------------------
 
-PyPy is a fast alternative implementation of Python. This talk will describe
-what happened in the PyPy ecosystem in the last 2 years and what the future
-holds. Topics such as JIT improvements, garbage collection, CFFI, Numpy, STM
-and Python 3 will be covered.
+This talk describes what happened in the PyPy ecosystem in the last 2 years, a
+timeframe in which PyPy has been successfully deployed multiple times while
+yielding interesting performance improvements and a timeframe in which more
+libraries started being compatible with PyPy through the use of cffi.
 
-Abstract
---------
+Detailed Abstract
+-----------------
 
-This talk will cover what has happened in the PyPy world during the last 2
-years :
+PyPy has been in the works for more than ten years and has reached relative
+maturity with more and more libraries working under PyPy and more deployments
+happening. Right now it entertains between 0.5-1.0% of PyPI package downloads
+(with CPython taking virtually all of the rest), used mostly for
+high-performance web servers.
 
-- Progress in Python 3 support and Numpy support
+Since no PyPy talk happened at PyCon 2014, we would like to present what
+we have achieved during the two years between talks. We would like to cover
+advancements in the PyPy performance landscape, but more importantly how
+we're addresssing the community needs and building the ecosystem. These days
+a lot of libraries that used to bind to C using the CPython C API are either
+using cffi or have alternatives using cffi.
 
-- Performance improvements
+We would also like to walk through a few success stories that we have
+experienced. Unfortunately the biggest chunk of PyPy clients are very
+secretive (e.g. trading companies), but we can still present a few case studies.
 
-- An attempt to remove the GIL using Software Transactional Memory
-
-- CFFI : The best way to interface with C code on PyPy
-
-- Status of the crowdfunding
-
-- ARM
+XXXX
diff --git a/talk/uct2014/example/demo1.py b/talk/uct2014/example/demo1.py
--- a/talk/uct2014/example/demo1.py
+++ b/talk/uct2014/example/demo1.py
@@ -12,7 +12,7 @@
     except ValueError:
         print "Requires ints"
         return 1
-    print "Added", arg0 + arg1
+    print "Got", adder(arg0, arg1)
     return 0
 
 def target(*args):
diff --git a/talk/uct2014/example/interp.py b/talk/uct2014/example/interp.py
--- a/talk/uct2014/example/interp.py
+++ b/talk/uct2014/example/interp.py
@@ -46,3 +46,7 @@
 
 def target(*args):
     return entry_point
+
+if __name__ == '__main__':
+    import sys
+    entry_point(sys.argv)