[SQL-CVS] SQLObject development repository branch master updated. 2.0.0b1-5-g2239d6c

[Oleg B. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  2239d6c3a88d61a5952acdd75ee242bfc4e9a10d (commit)
       via  ed063879cd0f736565b395fc8209009ead96a614 (commit)
       via  0eaf8e9e4c17cb687da9e942a6feb61f165b7905 (commit)
      from  151dd76acba8ab386ef1d8c9639577a5c63fffab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/2239d6c3a88d61a5952acdd75ee242bfc4e9a10d

commit 2239d6c3a88d61a5952acdd75ee242bfc4e9a10d
Merge: ed06387 0eaf8e9
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Dec 11 16:58:16 2014 +0300

    Merge branch '2.0'


http://sourceforge.net/p/sqlobject/sqlobject/ci/ed063879cd0f736565b395fc8209009ead96a614

commit ed063879cd0f736565b395fc8209009ead96a614
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Dec 11 16:49:26 2014 +0300

    Next branch will be 3.0

diff --git a/README.txt b/README.txt
index 148ee85..466fe2d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-SQLObject 2.0.0b1
+SQLObject 3.0.0a0
 =================
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational
diff --git a/docs/News.txt b/docs/News.txt
index 67045ce..38488fd 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -7,9 +7,12 @@ News
 
 .. _start:
 
-SQLObject 2.0.0 (master)
+SQLObject 3.0.0 (master)
 ========================
 
+SQLObject 2.0.0
+===============
+
 Features & Interface
 --------------------
 
diff --git a/setup.py b/setup.py
index 41bd2de..b9aa5e7 100755
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@ and `GitHub <https://github.com/sqlobject>`_.
    :target: https://travis-ci.org/sqlobject/sqlobject
 """,
       classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 1 - Planning",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
         "Programming Language :: Python",
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index e334faa..a388dcf 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,8 +1,8 @@
 
-version = '2.0.0b1'
-major   = 2
+version = '3.0'
+major   = 3
 minor   = 0
 micro   = 0
-release_level = 'beta'
-serial  = 1
+release_level = 'trunk'
+serial  = 0
 version_info = (major, minor, micro, release_level, serial)

-----------------------------------------------------------------------

Summary of changes:
 README.txt               |    2 +-
 docs/News.txt            |    5 ++++-
 setup.py                 |    2 +-
 sqlobject/__version__.py |    8 ++++----
 4 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
SQLObject development repository