diff options
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | doc/main.txt | 12 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | version.txt | 2 | ||||
| -rw-r--r-- | versioninfo.py | 10 |
5 files changed, 13 insertions, 17 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 71e7014b..63756788 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,8 +2,8 @@ lxml changelog ============== -3.5.0 beta 1 (2015-??) -========================= +3.5.0b1 (2015-09-18) +==================== Features added -------------- diff --git a/doc/main.txt b/doc/main.txt index 3f2cb96f..8ed78945 100644 --- a/doc/main.txt +++ b/doc/main.txt @@ -157,8 +157,8 @@ Index <http://pypi.python.org/pypi/lxml/>`_ (PyPI). It has the source that compiles on various platforms. The source distribution is signed with `this key <pubkey.asc>`_. -The latest version is `lxml 3.5.0beta1`_, released 2015-04-25 -(`changes for 3.5.0beta1`_). `Older versions <#old-versions>`_ +The latest version is `lxml 3.5.0b1`_, released 2015-09-18 +(`changes for 3.5.0b1`_). `Older versions <#old-versions>`_ are listed below. Please take a look at the @@ -242,9 +242,9 @@ See the web sites of lxml `3.4 <http://lxml.de/3.4/>`_ and the `latest in-development version <http://lxml.de/dev/>`_. -.. _`PDF documentation`: lxmldoc-3.5.0beta1.pdf +.. _`PDF documentation`: lxmldoc-3.5.0b1.pdf -* `lxml 3.5.0beta1`_, released 2015-04-25 (`changes for 3.5.0beta1`_) +* `lxml 3.5.0b1`_, released 2015-09-18 (`changes for 3.5.0b1`_) * `lxml 3.4.4`_, released 2015-04-25 (`changes for 3.4.4`_) @@ -258,14 +258,14 @@ and the `latest in-development version <http://lxml.de/dev/>`_. * `older releases <http://lxml.de/3.4/#old-versions>`_ -.. _`lxml 3.5.0beta1`: /files/lxml-3.5.0beta1.tgz +.. _`lxml 3.5.0b1`: /files/lxml-3.5.0b1.tgz .. _`lxml 3.4.4`: /files/lxml-3.4.4.tgz .. _`lxml 3.4.3`: /files/lxml-3.4.3.tgz .. _`lxml 3.4.2`: /files/lxml-3.4.2.tgz .. _`lxml 3.4.1`: /files/lxml-3.4.1.tgz .. _`lxml 3.4.0`: /files/lxml-3.4.0.tgz -.. _`changes for 3.5.0beta1`: /changes-3.5.0beta1.html +.. _`changes for 3.5.0b1`: /changes-3.5.0b1.html .. _`changes for 3.4.4`: /changes-3.4.4.html .. _`changes for 3.4.3`: /changes-3.4.3.html .. _`changes for 3.4.2`: /changes-3.4.2.html @@ -179,8 +179,6 @@ setup( maintainer="lxml dev team", maintainer_email="lxml-dev@lxml.de", url="http://lxml.de/", - download_url="http://pypi.python.org/packages/source/l/lxml/lxml-%s.tar.gz" % lxml_version, - # Commented out because this causes distutils to emit warnings # `Unknown distribution option: 'bugtrack_url'` # which distract folks from real causes of problems when troubleshooting diff --git a/version.txt b/version.txt index ccc40554..404adce7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.5.0.beta1 +3.5.0b1 diff --git a/versioninfo.py b/versioninfo.py index a07d03e9..5852ea10 100644 --- a/versioninfo.py +++ b/versioninfo.py @@ -19,16 +19,14 @@ def branch_version(): def is_pre_release(): version_string = version() - return "dev" in version_string or "alpha" in version_string or "beta" in version_string + return "a" in version_string or "b" in version_string def dev_status(): _version = version() - if 'dev' in _version: + if 'a' in _version: return 'Development Status :: 3 - Alpha' - elif 'alpha' in _version: - return 'Development Status :: 3 - Alpha' - elif 'beta' in _version: + elif 'b' in _version or 'c' in _version: return 'Development Status :: 4 - Beta' else: return 'Development Status :: 5 - Production/Stable' @@ -59,7 +57,7 @@ def create_version_h(): parts = lxml_version.split('-') while parts[0].count('.') < 2: parts[0] += '.0' - lxml_version = '-'.join(parts) + lxml_version = '-'.join(parts).replace('a', '.alpha').replace('b', '.beta') version_h = open( os.path.join(get_base_dir(), 'src', 'lxml', 'includes', 'lxml-version.h'), |