[pypy-svn] r12350 - in pypy: dist/pypy/documentation/website www/pypywww www/pypywww/render
hpk at codespeak.net
hpk at codespeak.net
Mon May 16 14:17:57 CEST 2005
Author: hpk
Date: Mon May 16 14:17:57 2005
New Revision: 12350
Added:
pypy/dist/pypy/documentation/website/news.txt
- copied, changed from r12348, pypy/dist/pypy/documentation/website/home.txt
Modified:
pypy/dist/pypy/documentation/website/contact.txt
pypy/dist/pypy/documentation/website/home.txt
pypy/dist/pypy/documentation/website/install.txt
pypy/www/pypywww/config.py
pypy/www/pypywww/render/doc.py
pypy/www/pypywww/render/main.py
pypy/www/pypywww/render/page.py
Log:
issue1 testing
The new webpage is now online, please have a look at
see if you like it this way. Main changes:
- there is now a 'home' and 'news' page
- there is now a 'contact' page listing not only
mailing lists but issue tracker and IRC information
- there is a very preliminary 'install' document
(should i take that out unless it's ready?)
- From now on the website contents come from pypy/documentation/website
so if you want to fix a typo or add information then just commit it
locally - it will trigger the website to be updated (usually quick but
it depends a bit).
- Be sure to always issue 'py.test' when changing documentation
and especially website content. py.test will check
ReST conformance and some link integrity. (run 'py.test -R'
to also check that all your remote links are fine).
- what is missing: the update of mailman's list templates
(the script that does it automatically is way out of date, sigh)
Modified: pypy/dist/pypy/documentation/website/contact.txt
==============================================================================
--- pypy/dist/pypy/documentation/website/contact.txt (original)
+++ pypy/dist/pypy/documentation/website/contact.txt Mon May 16 14:17:57 2005
@@ -1,13 +1,13 @@
PyPy mailing lists
==================
-`development mailing list`_ for conceptual and coding discussions (low to medium traffic).
+* `development mailing list`_ for conceptual and coding discussions (low to medium traffic).
-`subversion commit mailing list`_ all updates to the trunk/branch source and documentation tree.
+* `subversion commit mailing list`_ all updates to the trunk/branch source and documentation tree.
-`sprint mailing list`_ for people (interested in) attending upcoming sprints.
+* `sprint mailing list`_ for people (interested in) attending upcoming sprints.
-`EU partner mailing list`_ for people involved with EU administrative details
+* `EU partner mailing list`_ for people involved with EU administrative details
.. _`sprint mailing list`: http://codespeak.net/mailman/listinfo/pypy-sprint
.. _`subversion commit mailing list`: http://codespeak.net/mailman/listinfo/pypy-svn
@@ -18,10 +18,12 @@
PyPy issue trackers
===================
-`development bug/feature tracker`_ for filing bugs and feature requests.
-`EU milestone/issue tracking`_ for organizing work on EU-project milestones and deliverables
+* `development bug/feature tracker`_ for filing bugs and feature requests.
+
+* `EU milestone/issue tracking`_ for organizing work on EU-project milestones and deliverables
.. _`EU milestone/issue tracking`: https://codespeak.net/issue/pypy-eu/
+
.. _`development bug/feature tracker`: https://codespeak.net/issue/pypy-dev/
IRC Channel #pypy on freenode
@@ -30,4 +32,3 @@
Many of the core developers are hanging out at #pypy on irc.freenode.net.
You are welcome to join and ask questions even more so if you are interested
in participating in some parts of the PyPy project.
-
Modified: pypy/dist/pypy/documentation/website/home.txt
==============================================================================
--- pypy/dist/pypy/documentation/website/home.txt (original)
+++ pypy/dist/pypy/documentation/website/home.txt Mon May 16 14:17:57 2005
@@ -1,5 +1,5 @@
-Implementing Python in Python
-=============================
+PyPy: Implementing Python in Python
+===================================
The PyPy project aims at producing a simple runtime-system for the Python
language. We want to express the basic abstractions within the
@@ -12,26 +12,3 @@
.. _Psyco: http://psyco.sf.net
.. _Stackless: http://stackless.com
-
-
-(May 4th 2005) Next Sprint(s) around EuroPython 2005
-=====================================================
-
-The next sprint is scheduled right after EuroPython 2005 in Götheborg, Sweden.
-We take a day of break after the conference and do the sprint from 1st-7th
-of July 2005. Additionally there will be a four day Pre-EuroPython sprint
-for people who already are familiar with the PyPy code base.
-
-(March 28th 2005) Pycon 2005 Sprint in Washington finished
-==========================================================
-
-Our `Pycon 2005 Sprint`_ finished and was a good success. In our new
-`revision report`_ we track information on compliancy with CPython. During the
-conferences we made good contacts with other Python implementors and look
-forward to closer cooperation.
-<small><i> 28 March. 2005</i></small>
-</div>
-
-.. _`revision report`: http://codespeak.net/pypy/rev/current/
-.. _`Pycon 2005 Sprint`: http://codespeak.net/svn/pypy/extradoc/sprintinfo/pycon2005-announcement.txt
-
Modified: pypy/dist/pypy/documentation/website/install.txt
==============================================================================
--- pypy/dist/pypy/documentation/website/install.txt (original)
+++ pypy/dist/pypy/documentation/website/install.txt Mon May 16 14:17:57 2005
@@ -1,7 +1,7 @@
-
Download and install PyPy
=========================
+XXX CAUTION: this page does not contain correct information yet
XXX merge with getting_started somehow?
There are currently two ways to install PyPy. If you have a subversion
@@ -12,6 +12,7 @@
*pypy-0.6*
`pypy-0.6.tar.gz`_
+
`pypy-0.6.zip`_
.. _`pypy-0.6.tar.gz`: http://codespeak.net/download/pypy/pypy-0.6.tar.gz
Copied: pypy/dist/pypy/documentation/website/news.txt (from r12348, pypy/dist/pypy/documentation/website/home.txt)
==============================================================================
--- pypy/dist/pypy/documentation/website/home.txt (original)
+++ pypy/dist/pypy/documentation/website/news.txt Mon May 16 14:17:57 2005
@@ -1,36 +1,22 @@
-Implementing Python in Python
-=============================
-
-The PyPy project aims at producing a simple runtime-system for the Python
-language. We want to express the basic abstractions within the
-Python Language itself. We later want to have a minimal
-core which is not written in Python and doesn't need CPython anymore.
-We want to take care that technologies such as `Psyco`_ and `Stackless`_
-will easily integrate. Simplicity and Flexibilty are the foremost goals.
-Rumors have it that the secret goal is being faster-than-C which is
-nonsense, isn't it?
-
-.. _Psyco: http://psyco.sf.net
-.. _Stackless: http://stackless.com
-
-
-(May 4th 2005) Next Sprint(s) around EuroPython 2005
-=====================================================
+Next Sprint after EuroPython 2005 1st-7th July
+======================================================
The next sprint is scheduled right after EuroPython 2005 in Götheborg, Sweden.
-We take a day of break after the conference and do the sprint from 1st-7th
-of July 2005. Additionally there will be a four day Pre-EuroPython sprint
+We take a day of break after the conference and start sprinting from 1st-7th
+of July 2005. The sprint theme is likely to be related strongly to
+translation and working towards getting a first self-contained PyPy
+version. Additionally there will be a four day Pre-EuroPython sprint
for people who already are familiar with the PyPy code base.
+*(05/04/2005)*
-(March 28th 2005) Pycon 2005 Sprint in Washington finished
+Pycon 2005 Sprint in Washington finished
==========================================================
Our `Pycon 2005 Sprint`_ finished and was a good success. In our new
`revision report`_ we track information on compliancy with CPython. During the
conferences we made good contacts with other Python implementors and look
forward to closer cooperation.
-<small><i> 28 March. 2005</i></small>
-</div>
+*(03/28/2005)*
.. _`revision report`: http://codespeak.net/pypy/rev/current/
.. _`Pycon 2005 Sprint`: http://codespeak.net/svn/pypy/extradoc/sprintinfo/pycon2005-announcement.txt
Modified: pypy/www/pypywww/config.py
==============================================================================
--- pypy/www/pypywww/config.py (original)
+++ pypy/www/pypywww/config.py Mon May 16 14:17:57 2005
@@ -10,6 +10,7 @@
self.rawpath = self.wwwdir / 'rawdoc'
assert self.rawpath.check()
self.localdocpath = self.wwwdir.dirpath() / 'dist' / 'pypy' / 'documentation'
+ self.localwebsitedocs = self.localdocpath.join('website')
assert self.localdocpath.check()
self.localextradocpath = self.wwwdir.dirpath() / 'extradoc'
assert self.localextradocpath.check()
Modified: pypy/www/pypywww/render/doc.py
==============================================================================
--- pypy/www/pypywww/render/doc.py (original)
+++ pypy/www/pypywww/render/doc.py Mon May 16 14:17:57 2005
@@ -106,14 +106,8 @@
return self.gen_content(docpath)
def set_doc_redirect(self, reldoc):
- root = iexec.getinstance(html.html)
- head = root[0]
url = self.gw.url.new(query='doc/%s' % reldoc)
- head.append(html.meta(" ", **{
- 'HTTP-EQUIV': "Refresh",
- 'CONTENT': "0; URL=%s" % str(url)}))
- <html.div>:
- <html.p("you should be redirected to %s" %str(url))>
+ self.set_redirect(url)
def gen_navlist(self, basepath):
navpath = basepath.join('navlist')
@@ -204,3 +198,13 @@
self.gen_treeview(dir)
for dir in last:
self.gen_treeview(dir)
+
+class WebsitePage(Documentation):
+ def __init__(self, fname):
+ super(WebsitePage, self).__init__()
+ self.fname = fname
+
+ def content(self):
+ self.config = getconfig()
+ fspath = self.config.localwebsitedocs.join(self.fname).new(ext='.html')
+ xml.append(unicode(fspath.read(), 'utf8'))
Modified: pypy/www/pypywww/render/main.py
==============================================================================
--- pypy/www/pypywww/render/main.py (original)
+++ pypy/www/pypywww/render/main.py Mon May 16 14:17:57 2005
@@ -3,7 +3,7 @@
py.magic.autopath()
from pypywww.render.page import Page
from pypywww.render.raw import RawHtmlView
-from pypywww.render.doc import Documentation
+from pypywww.render.doc import Documentation, WebsitePage
from xpy import http
from py import path
@@ -17,6 +17,13 @@
#print "making url", str(url), "from", str(gw.url)
return str(url)
+class Redirect(Documentation):
+ def __init__(self, newurl):
+ self.newurl = newurl
+
+ def content(self):
+ self.set_redirect(self.newurl)
+
class ExtMenuItem(MenuItem):
def __init__(self, name, url):
self.name = name
@@ -27,15 +34,21 @@
return gw.url.new(self._url)
menuitems = [
- MenuItem('home'), MenuItem('doc'), MenuItem('lists'),
- ExtMenuItem('issues' , '/issue/pypy-dev/'), #MenuItem('source'),
+ MenuItem('home'), MenuItem('news'), MenuItem('doc'),
+ MenuItem('contact'), MenuItem('install'),
+ ExtMenuItem('issues' , 'https://codespeak.net/issue/pypy-dev/'), #MenuItem('source'),
ExtMenuItem('moin', '/moin/pypy/moin.cgi/FrontPage?action=show'),
]
rendermap = {
- 'home' : RawHtmlView('home'),
+ #'home' : RawHtmlView('home'),
'doc' : Documentation(),
'extradoc' : Documentation(),
+ 'install' : WebsitePage('install'),
+ 'contact' : WebsitePage('contact'),
+ 'news' : WebsitePage('news'),
+ 'lists' : Redirect('https://codespeak.net/pypy/index.cgi?contact'),
+ 'home' : WebsitePage('home'),
#'source' : RawHtmlView('source'),
'summary1' : RawHtmlView('summary1'),
'summary2' : RawHtmlView('summary2'),
@@ -58,4 +71,3 @@
class Dump(Page):
def content(self):
http.getgateway().dump()
-
Modified: pypy/www/pypywww/render/page.py
==============================================================================
--- pypy/www/pypywww/render/page.py (original)
+++ pypy/www/pypywww/render/page.py Mon May 16 14:17:57 2005
@@ -3,12 +3,22 @@
# =====================================================================
from xpy import html, http, xml
from pypywww.config import getconfig
+import iexec
class Page(object):
def gettitle(self):
return "PyPy %s" % http.getgateway().name
+ def set_redirect(self, url):
+ root = iexec.getinstance(html.html)
+ head = root[0]
+ head.append(html.meta(" ", **{
+ 'HTTP-EQUIV': "Refresh",
+ 'CONTENT': "0; URL=%s" % str(url)}))
+ <html.div>:
+ <html.p("you should be redirected to %s" %str(url))>
+
def render(self):
<http.Document>:
<html.html>:
More information about the Pypy-commit
mailing list