diff --git a/CREDITS.txt b/CREDITS.txt index adef160f1..3c75367e2 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -71,8 +71,10 @@ Special thanks goes to: * Fredrik Lundh for ElementTree, its API, and the competition through cElementTree. -* Greg Ewing (Pyrex) and Robert Bradshaw (Cython) for the binding - technology. +* Greg Ewing (Pyrex) and Robert Bradshaw et al. (Cython) for the + binding technology. + +* Jonathan Stoppani for hosting the new mailing list on lxml.de. * the codespeak crew, in particular Philipp von Weitershausen and - Holger Krekel for hosting lxml on codespeak.net + Holger Krekel for originally hosting lxml on codespeak.net diff --git a/INSTALL.txt b/INSTALL.txt index 2c28d4ba0..6103c6252 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -95,7 +95,7 @@ If you have read these instructions and still cannot manage to install lxml, you can check the archives of the `mailing list`_ to see if your problem is known or otherwise send a mail to the list. - .. _`mailing list`: http://codespeak.net/mailman/listinfo/lxml-dev +.. _`mailing list`: http://lxml.de/mailinglist/ Using lxml with python-libxml2 diff --git a/Makefile b/Makefile index 97edaa5f1..cc82fc284 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ apihtml: inplace PYTHONPATH=. epydoc -v --docformat "restructuredtext en" \ -o ../doc/html/api --exclude='[.]html[.]tests|[.]_' \ --exclude-introspect='[.]usedoctest' \ - --name "lxml API" --url http://codespeak.net/lxml/ lxml/) \ + --name "lxml API" --url / lxml/) \ || (echo "not generating epydoc API documentation") website: inplace @@ -75,7 +75,7 @@ apipdf: inplace PYTHONPATH=. epydoc -v --latex --docformat "restructuredtext en" \ -o ../doc/pdf --exclude='([.]html)?[.]tests|[.]_' \ --exclude-introspect='html[.]clean|[.]usedoctest' \ - --name "lxml API" --url http://codespeak.net/lxml/ lxml/) \ + --name "lxml API" --url / lxml/) \ || (echo "not generating epydoc API documentation") pdf: apipdf diff --git a/doc/main.txt b/doc/main.txt index 6c302fe0f..2979fac4f 100644 --- a/doc/main.txt +++ b/doc/main.txt @@ -161,25 +161,24 @@ documentation for offline use, take the source archive and copy the ``doc/html`` directory out of the source tree. It's also possible to check out the latest development version of lxml -from svn directly, using a command like this:: +from github directly, using a command like this (assuming you use hg +and have have hg-git installed):: - svn co http://codespeak.net/svn/lxml/trunk lxml + hg clone https://github.com/lxml/lxml.git lxml -You can also browse the `Subversion repository`_ through the web, or -take a look at the `Subversion history`_. Please read `how to build lxml -from source`_ first. The `latest CHANGES`_ of the developer version -are also accessible. You can check there if a bug you found has been -fixed or a feature you want has been implemented in the latest trunk -version. +You can also browse the `source repository`_ and its history through +the web. Please read `how to build lxml from source`_ first. The +`latest CHANGES`_ of the developer version are also accessible. You +can check there if a bug you found has been fixed or a feature you +want has been implemented in the latest trunk version. .. _`lxml at the Python Package Index`: http://pypi.python.org/pypi/lxml/ .. _`this key`: pubkey.asc .. _`Older versions`: #old-versions .. _`installation instructions`: installation.html .. _`how to build lxml from source`: build.html -.. _`Subversion repository`: http://codespeak.net/svn/lxml/ -.. _`Subversion history`: https://codespeak.net/viewvc/lxml/ -.. _`latest CHANGES`: http://codespeak.net/svn/lxml/trunk/CHANGES.txt +.. _`source repository`: https://github.com/lxml/lxml/ +.. _`latest CHANGES`: https://github.com/lxml/lxml/blob/master/CHANGES.txt Mailing list @@ -189,9 +188,9 @@ Questions? Suggestions? Code to contribute? We have a `mailing list`_. You can search the archive with Gmane_ or Google_. -.. _`mailing list`: http://codespeak.net/mailman/listinfo/lxml-dev +.. _`mailing list`: http://lxml.de/mailinglist/ .. _Gmane: http://blog.gmane.org/gmane.comp.python.lxml.devel -.. _Google: http://www.google.com/webhp?q=site:codespeak.net%2Fmailman%2Flistinfo%2Flxml-dev+ +.. _Google: http://www.google.com/webhp?q=site:comments.gmane.org%2Fgmane.comp.python.lxml.devel+ Bug tracker @@ -213,20 +212,20 @@ The lxml library is shipped under a `BSD license`_. libxml2 and libxslt2 itself are shipped under the `MIT license`_. There should therefore be no obstacle to using lxml in your codebase. -.. _`BSD license`: http://codespeak.net/svn/lxml/trunk/doc/licenses/BSD.txt +.. _`BSD license`: https://github.com/lxml/lxml/blob/master/doc/licenses/BSD.txt .. _`MIT license`: http://www.opensource.org/licenses/mit-license.html Old Versions ------------ -See the web sites of lxml `1.3 `_, -`2.0 `_, `2.1 -`_, `2.2 -`_ and the `current stable version -`_ +See the web sites of lxml `1.3 `_, +`2.0 `_, `2.1 +`_, `2.2 +`_ and the `current stable version +`_ -.. `current in-development version `_. +.. `current in-development version `_. .. _`PDF documentation`: lxmldoc-2.3.pdf diff --git a/setup.py b/setup.py index 7c195d75f..bd6ccf50a 100644 --- a/setup.py +++ b/setup.py @@ -48,12 +48,12 @@ branch_link = """ After an official release of a new stable series, bug fixes may become available at -http://codespeak.net/svn/lxml/branch/lxml-%(branch_version)s . +https://github.com/lxml/lxml-maintenance/tree/lxml-%(branch_version)s . Running ``easy_install lxml==%(branch_version)sbugfix`` will install the unreleased branch state from -http://codespeak.net/svn/lxml/branch/lxml-%(branch_version)s#egg=lxml-%(branch_version)sbugfix +https://github.com/lxml/lxml-maintenance/tarball/lxml-%(branch_version)s#egg=lxml-%(branch_version)sbugfix as soon as a maintenance branch has been established. Note that this -requires Cython to be installed for the build. +requires Cython to be installed at an appropriate version for the build. """ if versioninfo.is_pre_release(): @@ -66,10 +66,10 @@ name = "lxml", version = versioninfo.version(), author="lxml dev team", - author_email="lxml-dev@codespeak.net", + author_email="lxml-dev@lxml.de", maintainer="lxml dev team", - maintainer_email="lxml-dev@codespeak.net", - url="http://codespeak.net/lxml", + maintainer_email="lxml-dev@lxml.de", + url="http://lxml.de/", download_url="http://pypi.python.org/packages/source/l/lxml/lxml-%s.tar.gz" % versioninfo.version(), description="Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.", @@ -83,16 +83,17 @@ RelaxNG, XML Schema, XSLT, C14N and much more. To contact the project, go to the `project home page -`_ or see our bug tracker at +`_ or see our bug tracker at https://launchpad.net/lxml In case you want to use the current in-development version of lxml, -you can get it from the subversion repository at -http://codespeak.net/svn/lxml/trunk . Note that this requires Cython -to build the sources, see the build instructions on the project home +you can get it from the github repository at +https://github.com/lxml/lxml . Note that this requires Cython to +build the sources, see the build instructions on the project home page. To the same end, running Running ``easy_install lxml==dev`` will install lxml from -http://codespeak.net/svn/lxml/trunk#egg=lxml-dev +https://github.com/lxml/lxml/tarball/master#egg=lxml-dev if you have +an appropriate version of Cython installed. """ + branch_link) % { "branch_version" : versioninfo.branch_version() }) + versioninfo.changes()),