Author: phd
Date: Mon Mar 21 12:05:30 2011
New Revision: 4362
Log:
Merged revision 4361 from branch 1.0: a new module ``__version__.py`` was added.
Added:
SQLObject/trunk/sqlobject/__version__.py
- copied, changed from r4361, SQLObject/branches/1.0/sqlobject/__version__.py
Modified:
SQLObject/trunk/docs/News.txt
SQLObject/trunk/docs/TODO.txt
SQLObject/trunk/setup.py
SQLObject/trunk/sqlobject/__init__.py
Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt Mon Mar 21 11:58:57 2011 (r4361)
+++ SQLObject/trunk/docs/News.txt Mon Mar 21 12:05:30 2011 (r4362)
@@ -21,6 +21,10 @@
URIs if they are properly %-encoded, and DB URIs are automatically
unquoted.
+* A new module ``__version__.py`` was added. New variables ``version``
+ (string) and ``version_info`` (5-tuple: major, minor, micro, release
+ level, serial) are imported into ``sqlobject`` namespace.
+
* In SQLite, id columns are made AUTOINCREMENT.
* Parameter ``backend`` in DB URI is no longer supported, use parameter
Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt Mon Mar 21 11:58:57 2011 (r4361)
+++ SQLObject/trunk/docs/TODO.txt Mon Mar 21 12:05:30 2011 (r4362)
@@ -1,8 +1,6 @@
TODO
----
-* __version__.py
-
* Release 1.0.
* Decorators @classmethod and @staticmethod.
Modified: SQLObject/trunk/setup.py
==============================================================================
--- SQLObject/trunk/setup.py Mon Mar 21 11:58:57 2011 (r4361)
+++ SQLObject/trunk/setup.py Mon Mar 21 12:05:30 2011 (r4362)
@@ -9,6 +9,8 @@
from distutils.core import setup
is_setuptools = False
+from sqlobject import version
+
subpackages = ['firebird', 'include', 'include.pydispatch', 'inheritance',
'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'rdbhost',
'sqlite', 'sybase', 'util', 'versioning']
@@ -21,7 +23,7 @@
"""
setup(name="SQLObject",
- version="1.1",
+ version=version,
description="Object-Relational Manager, aka database wrapper",
long_description="""\
SQLObject is a popular *Object Relational Manager* for providing an
@@ -35,7 +37,7 @@
Supports MySQL, PostgreSQL, SQLite, Firebird, Sybase, MSSQL and MaxDB (SAPDB).
For development see the `subversion repository
-<http://svn.colorstudy.com/SQLObject/trunk#egg=SQLObject-1.1dev>`_
+<http://svn.colorstudy.com/SQLObject/trunk>`_
""",
classifiers=[
"Development Status :: 5 - Production/Stable",
@@ -49,7 +51,7 @@
author="Ian Bicking",
author_email="ianb@...",
url="http://sqlobject.org/devel/";,
- download_url="http://cheeseshop.python.org/pypi/SQLObject/1.1";,
+ download_url="http://cheeseshop.python.org/pypi/SQLObject/%s"; % version,
license="LGPL",
packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
Modified: SQLObject/trunk/sqlobject/__init__.py
==============================================================================
--- SQLObject/trunk/sqlobject/__init__.py Mon Mar 21 11:58:57 2011 (r4361)
+++ SQLObject/trunk/sqlobject/__init__.py Mon Mar 21 12:05:30 2011 (r4362)
@@ -1,6 +1,7 @@
"""
SQLObject 1.1
"""
+from __version__ import version, version_info
from col import *
from index import *
Copied and modified: SQLObject/trunk/sqlobject/__version__.py (from r4361, SQLObject/branches/1.0/sqlobject/__version__.py)
==============================================================================
--- SQLObject/branches/1.0/sqlobject/__version__.py Mon Mar 21 11:58:57 2011 (r4361, copy source)
+++ SQLObject/trunk/sqlobject/__version__.py Mon Mar 21 12:05:30 2011 (r4362)
@@ -1,7 +1,7 @@
-version = '1.0'
+version = '1.1'
major = 1
-minor = 0
+minor = 1
micro = 0
release_level = 'branch'
serial = 0
|