diff --git a/confrest.py b/confrest.py new file mode 100644 index 0000000000000000000000000000000000000000..730564346d5ca1953f4d1072e1ff7598d1dffa1b_Y29uZnJlc3QucHk= --- /dev/null +++ b/confrest.py @@ -0,0 +1,24 @@ +from py.__.documentation.confrest import * + +class PyPyPage(Page): + def fill(self): + super(PyPyPage, self).fill() + self.menubar[:] = html.div( + html.a("home", href="home.html", class_="menu"), " ", + html.a("news", href="news.html", class_="menu"), " ", + html.a("consortium", href="consortium.html", class_="menu"), " ", + " ", id="menubar") + +class Project(Project): + title = "PyPy EU Project" + stylesheet = 'style.css' + encoding = 'latin1' + prefix_title = "EU/PyPy" + logo = html.div( + html.a( + html.img(alt="PyPy", id="pyimg", + src="http://codespeak.net/pypy/img/py-web1.png", + height=110, width=149))) + Page = PyPyPage + + diff --git a/conftest.py b/conftest.py new file mode 100644 index 0000000000000000000000000000000000000000..730564346d5ca1953f4d1072e1ff7598d1dffa1b_Y29uZnRlc3QucHk= --- /dev/null +++ b/conftest.py @@ -0,0 +1,31 @@ +import py +from py.__.documentation.conftest import Directory, DoctestText, ReSTChecker + +class PyPyDoctestText(DoctestText): + + def run(self): + # XXX refine doctest support with respect to scoping + return + + def execute(self, module, docstring): + # XXX execute PyPy prompts as well + l = [] + for line in docstring.split('\n'): + if line.find('>>>>') != -1: + line = "" + l.append(line) + text = "\n".join(l) + super(PyPyDoctestText, self).execute(module, text) + + #mod = py.std.types.ModuleType(self.fspath.basename, text) + #self.mergescopes(mod, scopes) + #failed, tot = py.std.doctest.testmod(mod, verbose=1) + #if failed: + # py.test.fail("doctest %s: %s failed out of %s" %( + # self.fspath, failed, tot)) + +class PyPyReSTChecker(ReSTChecker): + DoctestText = PyPyDoctestText + +class Directory(Directory): + ReSTChecker = PyPyReSTChecker diff --git a/consortium.txt b/consortium.txt index a6edbe2337f5da1b825ede1d8ea22fcccf26eee2_Y29uc29ydGl1bS50eHQ=..730564346d5ca1953f4d1072e1ff7598d1dffa1b_Y29uc29ydGl1bS50eHQ= 100644 --- a/consortium.txt +++ b/consortium.txt @@ -8,5 +8,5 @@ Anders Lehmann anders.lehmann@dfki.de AB Strakt http://www.strakt.com - Jacob Hallén jacob@strakt.com (project manager) + Jacob Hallén jacob@strakt.com (project manager) Samuele Pedroni pedronis@strakt.com (technical board) @@ -12,4 +12,4 @@ Samuele Pedroni pedronis@strakt.com (technical board) - Anders Chrigström ac@strakt.com + Anders Chrigström ac@strakt.com Change Maker http://www.changemaker.nu @@ -14,7 +14,7 @@ Change Maker http://www.changemaker.nu - Beatrice Düring bea@changemaker.nu (assistant project manager) + Beatrice Düring bea@changemaker.nu (assistant project manager) Merlinux GmbH http://merlinux.de Holger Krekel krekel@merlinux.de (technical director/board) @@ -17,8 +17,8 @@ Merlinux GmbH http://merlinux.de Holger Krekel krekel@merlinux.de (technical director/board) -Heinrich Heine Universität Düsseldorf http://www.uni-duesseldorf.de/ +Heinrich Heine Universität Düsseldorf http://www.uni-duesseldorf.de/ Armin Rigo arigo@tunes.org (technical board) Tismerysoft http://www.stackless.com diff --git a/news.txt b/news.txt index a6edbe2337f5da1b825ede1d8ea22fcccf26eee2_bmV3cy50eHQ=..730564346d5ca1953f4d1072e1ff7598d1dffa1b_bmV3cy50eHQ= 100644 --- a/news.txt +++ b/news.txt @@ -4,7 +4,7 @@ The team met up, in total 14 people to work on the planned 0.7 release. PyPy sprint in Hildesheim July 2005 ----------------------------------- +---------------------------------------- The team met up at Trillke Gut and worked on the upcoming phase 1 deliverables. The result was PyPy - selfcontained! @@ -17,9 +17,9 @@ afterwards. There where also several PyPy talks at the conference, a joint talk by Holger Krekel, Armin Rigo, Carl Friedrich Bolz about translation aspects of PyPy, Holger Krekel about py.test and -Beatrice Düring about sprint driven development. This sprint had 20 +Beatrice Düring about sprint driven development. This sprint had 20 participants which is a PyPy record. PyPy at ACCU April 2005 ------------------------------------------------------ @@ -21,9 +21,9 @@ participants which is a PyPy record. PyPy at ACCU April 2005 ------------------------------------------------------ -Armin Rigo and Jacob Hallén held 2 talks at the ACCU conference,about PyPy and sprint driven +Armin Rigo and Jacob Hallén held 2 talks at the ACCU conference,about PyPy and sprint driven development. PyPy at PyCon in Washington March 2005 @@ -36,7 +36,7 @@ PyPy at the Calibre conference in Paris March 2005 ------------------------------------------------------ -Beatrice Düring from the PyPy team participated in the Calibre workshop +Beatrice Düring from the PyPy team participated in the Calibre workshop "Libre software - which business model?". Sprint in Leysin, Switzerland January 2005