sqlobject-cvs — CVS notification

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-43-gf1daa34

[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  f1daa34948d7df70b150dc3a635f8ce9a41007c7 (commit)
      from  4e55291fb74855f1b3e3ea20dbcc7865c2e2ee20 (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/f1daa34948d7df70b150dc3a635f8ce9a41007c7

commit f1daa34948d7df70b150dc3a635f8ce9a41007c7
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Nov 3 22:58:05 2016 +0300

    TODO: Ultramysql

diff --git a/docs/TODO.rst b/docs/TODO.rst
index 7d6c1e5..7a72de4 100644
--- a/docs/TODO.rst
+++ b/docs/TODO.rst
@@ -74,6 +74,9 @@ TODO
 
 * Pure Python Mysql Interface: https://github.com/nasi/MyPy
 
+* Ultramysql `for Python2 <https://github.com/esnme/ultramysql>` and
+  `Python3 <https://github.com/arpitbbhayani/umysql3>`.
+
 * pg8000 driver: http://code.google.com/p/pg8000/
 
 * py-postgresql driver: http://python.projects.postgresql.org/

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

Summary of changes:
 docs/TODO.rst |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-42-g4e55291

[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  4e55291fb74855f1b3e3ea20dbcc7865c2e2ee20 (commit)
      from  49943d5539d0424811f772ffc81a8cdc1902e252 (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/4e55291fb74855f1b3e3ea20dbcc7865c2e2ee20

commit 4e55291fb74855f1b3e3ea20dbcc7865c2e2ee20
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Nov 2 11:31:35 2016 +0300

    TODO: Type annotations and mypy tests

diff --git a/docs/TODO.rst b/docs/TODO.rst
index 37e46c7..7d6c1e5 100644
--- a/docs/TODO.rst
+++ b/docs/TODO.rst
@@ -124,6 +124,8 @@ TODO
 * Allow to override ConsoleWriter/LogWriter classes and makeDebugWriter
   function.
 
+* Type annotations and mypy tests.
+
 .. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
    :target: https://sourceforge.net/projects/sqlobject
    :class: noborder

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

Summary of changes:
 docs/TODO.rst |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-41-g49943d5

[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  49943d5539d0424811f772ffc81a8cdc1902e252 (commit)
       via  122ee634dcd55e0f01d7f812ce93d2a9766e983e (commit)
       via  902d632099a25f0ed9a2c0b08fc2f65fa37d21c9 (commit)
      from  78dcedd293b3a41b69657a9ab5590cad657b24a1 (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/49943d5539d0424811f772ffc81a8cdc1902e252

commit 49943d5539d0424811f772ffc81a8cdc1902e252
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Oct 24 14:14:39 2016 +0300

    Update news
    
    Dropped table name from ``VACUUM`` command in SQLiteConnection.
    
    [skip ci]

diff --git a/docs/News.rst b/docs/News.rst
index 32c2a7d..7804d70 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -10,6 +10,13 @@ News
 SQLObject 3.2.0 (master)
 ========================
 
+Minor features
+--------------
+
+* Dropped table name from ``VACUUM`` command in SQLiteConnection:
+  SQLite doesn't vacuum a single table and SQLite 3.15 uses the supplied name
+  as the name of the attached database to vacuum.
+
 Documentation
 -------------
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/122ee634dcd55e0f01d7f812ce93d2a9766e983e

commit 122ee634dcd55e0f01d7f812ce93d2a9766e983e
Merge: 78dcedd 902d632
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Oct 24 15:08:18 2016 +0400

    Merge pull request #129 from drnlm/bugs/fix_issue_128_sqlite_3.15
    
    Fix issue #128 (SQLite 3.15 breakage) by dropping the table name from the call


http://sourceforge.net/p/sqlobject/sqlobject/ci/902d632099a25f0ed9a2c0b08fc2f65fa37d21c9

commit 902d632099a25f0ed9a2c0b08fc2f65fa37d21c9
Author: Neil <drn...@gm...>
Date:   Mon Oct 24 12:22:42 2016 +0200

    Fix issue 128 by dropping the table name from the call
    
    SQLite 3.15 treats the parameter to VACUUM as a schema name,
    not the table name. Dropping the parameter matches the
    behaviour on older versions, which simply ignored the parameter.

diff --git a/sqlobject/sqlite/sqliteconnection.py b/sqlobject/sqlite/sqliteconnection.py
index a0c347b..70fae63 100644
--- a/sqlobject/sqlite/sqliteconnection.py
+++ b/sqlobject/sqlite/sqliteconnection.py
@@ -310,7 +310,7 @@ class SQLiteConnection(DBAPI):
         self.query('ALTER TABLE %s ADD COLUMN %s' %
                    (tableName,
                     column.sqliteCreateSQL()))
-        self.query('VACUUM %s' % tableName)
+        self.query('VACUUM')
 
     def delColumn(self, sqlmeta, column):
         self.recreateTableWithoutColumn(sqlmeta, column)

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

Summary of changes:
 docs/News.rst                        |    7 +++++++
 sqlobject/sqlite/sqliteconnection.py |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-38-g78dcedd

[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  78dcedd293b3a41b69657a9ab5590cad657b24a1 (commit)
      from  14f2aca6f34b16de19997bf7a61ce971d5ab47e5 (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/78dcedd293b3a41b69657a9ab5590cad657b24a1

commit 78dcedd293b3a41b69657a9ab5590cad657b24a1
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Oct 7 07:19:08 2016 +0300

    Fix API docs
    
    sqlobject/inheritance/tests/testDestroyCascade.rst was renamed to
    sqlobject/inheritance/tests/test_destroy_cascade.rst
    
    [skip ci]

diff --git a/docs/api/sqlobject.inheritance.tests.rst b/docs/api/sqlobject.inheritance.tests.rst
index fe36e3e..994c85a 100644
--- a/docs/api/sqlobject.inheritance.tests.rst
+++ b/docs/api/sqlobject.inheritance.tests.rst
@@ -11,10 +11,10 @@ Submodules
 
 .. toctree::
 
-   sqlobject.inheritance.tests.testDestroyCascade
    sqlobject.inheritance.tests.test_aggregates
    sqlobject.inheritance.tests.test_asdict
    sqlobject.inheritance.tests.test_deep_inheritance
+   sqlobject.inheritance.tests.test_destroy_cascade
    sqlobject.inheritance.tests.test_foreignKey
    sqlobject.inheritance.tests.test_indexes
    sqlobject.inheritance.tests.test_inheritance
diff --git a/docs/api/sqlobject.inheritance.tests.testDestroyCascade.rst b/docs/api/sqlobject.inheritance.tests.testDestroyCascade.rst
deleted file mode 100644
index 7dc60f6..0000000
--- a/docs/api/sqlobject.inheritance.tests.testDestroyCascade.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-sqlobject.inheritance.tests.testDestroyCascade module
-=====================================================
-
-.. automodule:: sqlobject.inheritance.tests.testDestroyCascade
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.test_destroy_cascade.rst b/docs/api/sqlobject.inheritance.tests.test_destroy_cascade.rst
new file mode 100644
index 0000000..3c5e96d
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.test_destroy_cascade.rst
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.test_destroy_cascade module
+=======================================================
+
+.. automodule:: sqlobject.inheritance.tests.test_destroy_cascade
+    :members:
+    :undoc-members:
+    :show-inheritance:

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

Summary of changes:
 docs/api/sqlobject.inheritance.tests.rst           |    2 +-
 ...object.inheritance.tests.testDestroyCascade.rst |    7 -------
 ...ject.inheritance.tests.test_destroy_cascade.rst |    7 +++++++
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 docs/api/sqlobject.inheritance.tests.testDestroyCascade.rst
 create mode 100644 docs/api/sqlobject.inheritance.tests.test_destroy_cascade.rst


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-37-g14f2aca

[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  14f2aca6f34b16de19997bf7a61ce971d5ab47e5 (commit)
       via  dffd8dd9992d2ea8d8cb697f9f30671e42dd203a (commit)
       via  1aab655005bb6a9a859aae8d3b4aaef124015e51 (commit)
       via  6f1a003d27d045cd237b37d684cc17317c15d6fb (commit)
      from  d46347223b2a5ab154cbe3c14bc52e9915f9f5c1 (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/14f2aca6f34b16de19997bf7a61ce971d5ab47e5

commit 14f2aca6f34b16de19997bf7a61ce971d5ab47e5
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Oct 6 00:27:31 2016 +0300

    Rename py.test -> pytest in tests and docs

diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
index 588c781..9d62805 100644
--- a/docs/DeveloperGuide.rst
+++ b/docs/DeveloperGuide.rst
@@ -220,7 +220,7 @@ Testing
 Tests are important.  Tests keep everything from falling apart.  All
 new additions should have tests.
 
-Testing uses py.test, an alternative to ``unittest``.  It is available
+Testing uses pytest, an alternative to ``unittest``.  It is available
 at http://pytest.org/ and https://pypi.python.org/pypi/pytest.  Read its
 `getting started`_ document for more.
 
@@ -234,7 +234,7 @@ the top of ``tests/dbtest.py``).
 All the tests are modules in ``sqlobject/tests``.  Each module tests
 one kind of feature, more or less.  If you are testing a module, call
 the test module ``tests/test_modulename.py`` -- only modules that
-start with ``test_`` will be picked up by py.test.
+start with ``test_`` will be picked up by pytest.
 
 The "framework" for testing is in ``tests/dbtest``.  There's a couple of
 important functions:
@@ -246,7 +246,7 @@ avoid recreating tables if not necessary.
 named feature.  What backends support what is defined at the top of
 ``dbtest``.
 
-If you ``import *`` you'll also get py.test's version of raises_, an
+If you ``import *`` you'll also get pytest's version of raises_, an
 ``inserts`` function that can create instances for you, and a couple
 miscellaneous functions.
 
diff --git a/docs/News.rst b/docs/News.rst
index 397649d..32c2a7d 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -20,11 +20,13 @@ Documentation
 Tests
 -----
 
-* Great Renaming: fix py.test warnings by renaming TestXXX classes
-  to SOTestXXX to prevent py.test to recognize them as test classes.
+* Rename py.test -> pytest in tests and docs.
 
-* Fix py.test warnings by converting yield test to plain calls:
-  yield test were deprecated in py.test.
+* Great Renaming: fix pytest warnings by renaming TestXXX classes
+  to SOTestXXX to prevent pytest to recognize them as test classes.
+
+* Fix pytest warnings by converting yield test to plain calls:
+  yield test were deprecated in pytest.
 
 * Tests are now run at CIs with python3.5.
 
diff --git a/sqlobject/conftest.py b/sqlobject/conftest.py
index bcd2f7b..af39c6f 100644
--- a/sqlobject/conftest.py
+++ b/sqlobject/conftest.py
@@ -1,7 +1,4 @@
-"""
-This module is used by py.test to configure testing for this
-application.
-"""
+"""This module is used by pytest to configure testing"""
 
 try:
     import pkg_resources
diff --git a/sqlobject/inheritance/tests/test_deep_inheritance.py b/sqlobject/inheritance/tests/test_deep_inheritance.py
index f77edb2..f4e3fe5 100644
--- a/sqlobject/inheritance/tests/test_deep_inheritance.py
+++ b/sqlobject/inheritance/tests/test_deep_inheritance.py
@@ -1,4 +1,4 @@
-from py.test import raises, skip
+from pytest import raises, skip
 from sqlobject import ForeignKey, MultipleJoin, StringCol
 from sqlobject.inheritance import InheritableSQLObject
 from sqlobject.tests.dbtest import getConnection, setupClass, supports
diff --git a/sqlobject/inheritance/tests/test_inheritance.py b/sqlobject/inheritance/tests/test_inheritance.py
index b64b3f2..898c6be 100644
--- a/sqlobject/inheritance/tests/test_inheritance.py
+++ b/sqlobject/inheritance/tests/test_inheritance.py
@@ -1,4 +1,4 @@
-from py.test import raises
+from pytest import raises
 from sqlobject import IntCol, StringCol
 from sqlobject.inheritance import InheritableSQLObject
 from sqlobject.tests.dbtest import setupClass
diff --git a/sqlobject/tests/dbtest.py b/sqlobject/tests/dbtest.py
index bb5bb71..4279628 100644
--- a/sqlobject/tests/dbtest.py
+++ b/sqlobject/tests/dbtest.py
@@ -6,7 +6,7 @@ from __future__ import print_function
 import logging
 import os
 import sys
-from py.test import raises, skip
+from pytest import raises, skip
 import sqlobject
 import sqlobject.conftest as conftest
 
@@ -29,7 +29,7 @@ and you can use it like::
 
     def test_featureX():
         if not supports('featureX'):
-            py.test.skip("Doesn't support featureX")
+            pytest.skip("Doesn't support featureX")
 """
 supportsMatrix = {
     '+exceptions': 'mysql postgres sqlite',
diff --git a/sqlobject/tests/test_SQLMultipleJoin.py b/sqlobject/tests/test_SQLMultipleJoin.py
index d848772..9ee1467 100644
--- a/sqlobject/tests/test_SQLMultipleJoin.py
+++ b/sqlobject/tests/test_SQLMultipleJoin.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import ForeignKey, IntCol, MultipleJoin, SQLMultipleJoin, \
     SQLObject, StringCol
 from sqlobject.tests.dbtest import setupClass, supports
@@ -51,7 +51,7 @@ def test_1():
 
 def test_multiple_join_transaction():
     if not supports('transactions'):
-        py.test.skip("Transactions aren't supported")
+        pytest.skip("Transactions aren't supported")
     createAllTables()
     trans = Race._connection.transaction()
     try:
diff --git a/sqlobject/tests/test_SQLRelatedJoin.py b/sqlobject/tests/test_SQLRelatedJoin.py
index 24c367c..7620258 100644
--- a/sqlobject/tests/test_SQLRelatedJoin.py
+++ b/sqlobject/tests/test_SQLRelatedJoin.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import RelatedJoin, SQLObject, SQLRelatedJoin, StringCol
 from sqlobject.tests.dbtest import setupClass, supports
 
@@ -51,7 +51,7 @@ def test_1():
 
 def test_related_join_transaction():
     if not supports('transactions'):
-        py.test.skip("Transactions aren't supported")
+        pytest.skip("Transactions aren't supported")
     createAllTables()
     trans = Tourtment._connection.transaction()
     try:
diff --git a/sqlobject/tests/test_auto.py b/sqlobject/tests/test_auto.py
index 8291113..f3aa6da 100644
--- a/sqlobject/tests/test_auto.py
+++ b/sqlobject/tests/test_auto.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from py.test import raises
+from pytest import raises
 
 from sqlobject import KeyCol, MultipleJoin, SQLObject, StringCol, \
     classregistry, sqlmeta
diff --git a/sqlobject/tests/test_basic.py b/sqlobject/tests/test_basic.py
index fff3f2e..c44eb24 100644
--- a/sqlobject/tests/test_basic.py
+++ b/sqlobject/tests/test_basic.py
@@ -1,5 +1,5 @@
 import codecs
-import py.test
+import pytest
 from sqlobject import BoolCol, ForeignKey, IntCol, KeyCol, SQLObject, \
     StringCol, connectionForURI, sqlhub
 from sqlobject.tests.dbtest import inserts, raises, setupClass, supports
@@ -211,7 +211,7 @@ def test_foreignKeyDestroySelfCascade():
 
 def testForeignKeyDropTableCascade():
     if not supports('dropTableCascade'):
-        py.test.skip("dropTableCascade isn't supported")
+        pytest.skip("dropTableCascade isn't supported")
     setupClass(SOTestSO7)
     setupClass(SOTestSO6)
     setupClass(SOTestSO5)
diff --git a/sqlobject/tests/test_blob.py b/sqlobject/tests/test_blob.py
index 843c371..b8c2e3c 100644
--- a/sqlobject/tests/test_blob.py
+++ b/sqlobject/tests/test_blob.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import BLOBCol, SQLObject
 from sqlobject.compat import PY2
 from sqlobject.tests.dbtest import setupClass, supports
@@ -15,7 +15,7 @@ class ImageData(SQLObject):
 
 def test_BLOBCol():
     if not supports('blobData'):
-        py.test.skip("blobData isn't supported")
+        pytest.skip("blobData isn't supported")
     setupClass(ImageData)
     if PY2:
         data = ''.join([chr(x) for x in range(256)])
diff --git a/sqlobject/tests/test_boundattributes.py b/sqlobject/tests/test_boundattributes.py
index 3517933..5ae2015 100644
--- a/sqlobject/tests/test_boundattributes.py
+++ b/sqlobject/tests/test_boundattributes.py
@@ -1,9 +1,9 @@
-import py.test
+import pytest
 
 from sqlobject import boundattributes
 from sqlobject import declarative
 
-pytestmark = py.test.mark.skipif('True')
+pytestmark = pytest.mark.skipif('True')
 
 
 class SOTestMe(object):
diff --git a/sqlobject/tests/test_cyclic_reference.py b/sqlobject/tests/test_cyclic_reference.py
index 3851ce2..5a4fede 100644
--- a/sqlobject/tests/test_cyclic_reference.py
+++ b/sqlobject/tests/test_cyclic_reference.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import BLOBCol, DateTimeCol, ForeignKey, IntCol, SQLObject, \
     StringCol, sqlmeta
 from sqlobject.tests.dbtest import getConnection, supports
@@ -30,7 +30,7 @@ class SOTestCyclicReferenceB(SQLObject):
 
 def test_cyclic_reference():
     if not supports('dropTableCascade'):
-        py.test.skip("dropTableCascade isn't supported")
+        pytest.skip("dropTableCascade isn't supported")
     conn = getConnection()
     SOTestCyclicReferenceA.setConnection(conn)
     SOTestCyclicReferenceB.setConnection(conn)
diff --git a/sqlobject/tests/test_datetime.py b/sqlobject/tests/test_datetime.py
index a6fcbcc..5f16f37 100644
--- a/sqlobject/tests/test_datetime.py
+++ b/sqlobject/tests/test_datetime.py
@@ -1,5 +1,5 @@
 from datetime import datetime, date, time
-import py.test
+import pytest
 
 from sqlobject import SQLObject
 from sqlobject import col
@@ -51,7 +51,7 @@ def test_microseconds():
     connection = getConnection()
     if hasattr(connection, 'can_use_microseconds') and \
             not connection.can_use_microseconds():
-        py.test.skip(
+        pytest.skip(
             "The database doesn't support microseconds; "
             "microseconds are supported by MariaDB since version 5.3.0, "
             "by MySQL since version 5.6.4, "
diff --git a/sqlobject/tests/test_decimal.py b/sqlobject/tests/test_decimal.py
index b8ac479..82c67e9 100644
--- a/sqlobject/tests/test_decimal.py
+++ b/sqlobject/tests/test_decimal.py
@@ -1,5 +1,5 @@
 from decimal import Decimal
-import py.test
+import pytest
 from sqlobject import DecimalCol, DecimalStringCol, SQLObject, UnicodeCol
 from sqlobject.tests.dbtest import setupClass, supports
 
@@ -15,7 +15,7 @@ except NameError:
     # The module was imported during documentation building
     support_decimal_column = True
 if not support_decimal_column:
-    pytestmark = py.test.mark.skip('')
+    pytestmark = pytest.mark.skip('')
 
 
 class DecimalTable(SQLObject):
diff --git a/sqlobject/tests/test_empty.py b/sqlobject/tests/test_empty.py
index b829340..c0f725f 100644
--- a/sqlobject/tests/test_empty.py
+++ b/sqlobject/tests/test_empty.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import SQLObject
 from sqlobject.tests.dbtest import setupClass, supports
 
@@ -10,7 +10,7 @@ class EmptyClass(SQLObject):
 
 def test_empty():
     if not supports('emptyTable'):
-        py.test.skip("emptyTable isn't supported")
+        pytest.skip("emptyTable isn't supported")
     setupClass(EmptyClass)
     e1 = EmptyClass()
     e2 = EmptyClass()
diff --git a/sqlobject/tests/test_exceptions.py b/sqlobject/tests/test_exceptions.py
index 85668e5..42dd134 100644
--- a/sqlobject/tests/test_exceptions.py
+++ b/sqlobject/tests/test_exceptions.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import SQLObject, StringCol
 from sqlobject.dberrors import DuplicateEntryError, ProgrammingError
 from sqlobject.tests.dbtest import getConnection, raises, setupClass, supports
@@ -19,7 +19,7 @@ class SOTestExceptionWithNonexistingTable(SQLObject):
 
 def test_exceptions():
     if not supports("exceptions"):
-        py.test.skip("exceptions aren't supported")
+        pytest.skip("exceptions aren't supported")
     setupClass(SOTestException)
     SOTestException(name="test")
     raises(DuplicateEntryError, SOTestException, name="test")
diff --git a/sqlobject/tests/test_indexes.py b/sqlobject/tests/test_indexes.py
index 491936a..bb727aa 100644
--- a/sqlobject/tests/test_indexes.py
+++ b/sqlobject/tests/test_indexes.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import DatabaseIndex, ForeignKey, IntCol, MultipleJoin, \
     SQLObject, StringCol
 from sqlobject.dberrors import DatabaseError, IntegrityError, \
@@ -42,7 +42,7 @@ def test_indexes_1():
 
 def test_indexes_2():
     if not supports('expressionIndex'):
-        py.test.skip("expressionIndex isn't supported")
+        pytest.skip("expressionIndex isn't supported")
     setupClass(SOIndex2)
     SOIndex2(name='')
 
diff --git a/sqlobject/tests/test_jsonbcol.py b/sqlobject/tests/test_jsonbcol.py
index f11ed6a..f2054d9 100644
--- a/sqlobject/tests/test_jsonbcol.py
+++ b/sqlobject/tests/test_jsonbcol.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import SQLObject, JsonbCol
 from sqlobject.tests.dbtest import getConnection, setupClass
 
@@ -32,7 +32,7 @@ listofdictsdata = [dict(Erath=7390000000),
 def test_jsonbCol():
     connection = getConnection()
     if connection.dbName != "postgres":
-        py.test.skip("These tests require PostgreSQL")
+        pytest.skip("These tests require PostgreSQL")
 
     setupClass([JsonbContainer], force=True)
 
diff --git a/sqlobject/tests/test_mysql.py b/sqlobject/tests/test_mysql.py
index b1dbfc4..59c21ca 100644
--- a/sqlobject/tests/test_mysql.py
+++ b/sqlobject/tests/test_mysql.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import SQLObject
 from sqlobject.tests.dbtest import getConnection, setupClass
 
@@ -10,13 +10,13 @@ class SOTestSOListMySQL(SQLObject):
 def test_list_databases():
     connection = getConnection()
     if connection.dbName != "mysql":
-        py.test.skip("These tests require MySQL")
+        pytest.skip("These tests require MySQL")
     assert connection.db in connection.listDatabases()
 
 
 def test_list_tables():
     connection = getConnection()
     if connection.dbName != "mysql":
-        py.test.skip("These tests require MySQL")
+        pytest.skip("These tests require MySQL")
     setupClass(SOTestSOListMySQL)
     assert SOTestSOListMySQL.sqlmeta.table in connection.listTables()
diff --git a/sqlobject/tests/test_paste.py b/sqlobject/tests/test_paste.py
index e32ada8..3662309 100644
--- a/sqlobject/tests/test_paste.py
+++ b/sqlobject/tests/test_paste.py
@@ -1,11 +1,11 @@
 from __future__ import print_function
-import py.test
+import pytest
 
 from sqlobject import sqlhub, SQLObject, StringCol
 try:
     from sqlobject.wsgi_middleware import make_middleware
 except ImportError:
-    pytestmark = py.test.mark.skipif('True')
+    pytestmark = pytest.mark.skipif('True')
 from .dbtest import getConnection, getConnectionURI, setupClass
 
 
@@ -83,7 +83,7 @@ def test_other():
     # @@: Dammit, I can't get these to pass because I can't get the
     # stupid table to clear itself.  setupClass() sucks.  When I
     # fix it I'll take this disabling out:
-    py.test.skip("Oops...")
+    pytest.skip("Oops...")
     assert names() == []
     assert runapp(fail=False, begin=True, abort=True, use_transaction=True)
     assert names() == ['app1']
diff --git a/sqlobject/tests/test_pickle.py b/sqlobject/tests/test_pickle.py
index 0e95c36..05dfc17 100644
--- a/sqlobject/tests/test_pickle.py
+++ b/sqlobject/tests/test_pickle.py
@@ -1,5 +1,5 @@
 import pickle
-import py.test
+import pytest
 from sqlobject import IntCol, SQLObject, StringCol
 from sqlobject.tests.dbtest import getConnection, raises, setupClass
 
@@ -33,7 +33,7 @@ def test_pickleCol():
     assert test.answer == test_answer
 
     if (connection.dbName == 'sqlite') and connection._memory:
-        py.test.skip("The following test requires a different connection")
+        pytest.skip("The following test requires a different connection")
 
     test = SOTestPickle.get(
         test.id,
diff --git a/sqlobject/tests/test_picklecol.py b/sqlobject/tests/test_picklecol.py
index 976ffa0..f4eb932 100644
--- a/sqlobject/tests/test_picklecol.py
+++ b/sqlobject/tests/test_picklecol.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import PickleCol, SQLObject
 from sqlobject.tests.dbtest import setupClass, supports
 
@@ -23,7 +23,7 @@ class PickleContainer(SQLObject):
 
 def test_pickleCol():
     if not supports('blobData'):
-        py.test.skip("blobData isn't supported")
+        pytest.skip("blobData isn't supported")
     setupClass([PickleContainer], force=True)
     mypickledata = PickleData()
 
diff --git a/sqlobject/tests/test_postgres.py b/sqlobject/tests/test_postgres.py
index 73e5670..06c8835 100644
--- a/sqlobject/tests/test_postgres.py
+++ b/sqlobject/tests/test_postgres.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
 from sqlobject import SQLObject, StringCol
 from sqlobject.tests.dbtest import getConnection, setupClass
 
@@ -17,7 +17,7 @@ def test_sslmode():
     connection = SOTestSSLMode._connection
     if (connection.dbName != 'postgres') or \
             (not connection.module.__name__.startswith('psycopg')):
-        py.test.skip("The test requires PostgreSQL, psycopg and ssl mode")
+        pytest.skip("The test requires PostgreSQL, psycopg and ssl mode")
 
     connection = getConnection(sslmode='require')
     SOTestSSLMode._connection = connection
@@ -40,13 +40,13 @@ class SOTestSOList(SQLObject):
 def test_list_databases():
     connection = getConnection()
     if connection.dbName != "postgres":
-        py.test.skip("These tests require PostgreSQL")
+        pytest.skip("These tests require PostgreSQL")
     assert connection.db in connection.listDatabases()
 
 
 def test_list_tables():
     connection = getConnection()
     if connection.dbName != "postgres":
-        py.test.skip("These tests require PostgreSQL")
+        pytest.skip("These tests require PostgreSQL")
     setupClass(SOTestSOList)
     assert SOTestSOList.sqlmeta.table in connection.listTables()
diff --git a/sqlobject/tests/test_schema.py b/sqlobject/tests/test_schema.py
index 3b1aac5..4a7887d 100644
--- a/sqlobject/tests/test_schema.py
+++ b/sqlobject/tests/test_schema.py
@@ -1,4 +1,4 @@
-import py.test
+import pytest
... 700 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-33-gd463472

[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  d46347223b2a5ab154cbe3c14bc52e9915f9f5c1 (commit)
      from  402aa30b48224260eb4dc0d6ea41ff7d7a114f0f (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/d46347223b2a5ab154cbe3c14bc52e9915f9f5c1

commit d46347223b2a5ab154cbe3c14bc52e9915f9f5c1
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Sep 25 01:23:04 2016 +0300

    Run flake8 from root to test docs and scripts
    
    Exclude .tox virtual environments.

diff --git a/setup.cfg b/setup.cfg
index 2513bb3..de55225 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@ tag_date = 1
 tag_svn_revision = 0
 
 [flake8]
-exclude = .git,docs/europython/*.py,ez_setup.py
+exclude = .git,.tox,docs/europython/*.py,ez_setup.py
 
 [bdist_wheel]
 universal = 1
diff --git a/tox.ini b/tox.ini
index 4398dfa..7b1a6bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -86,11 +86,13 @@ commands = {[mysqlclient]commands}
 
 # Special test environments
 [testenv:py27-flake8]
+changedir = ./
 deps =
     flake8
 commands = flake8 .
 
 [testenv:py34-flake8]
+changedir = ./
 deps =
     flake8
 commands = flake8 .

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

Summary of changes:
 setup.cfg |    2 +-
 tox.ini   |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-32-g402aa30

[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  402aa30b48224260eb4dc0d6ea41ff7d7a114f0f (commit)
      from  2a7e330d0866c586171233c1dea1556d82bb3f9a (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/402aa30b48224260eb4dc0d6ea41ff7d7a114f0f

commit 402aa30b48224260eb4dc0d6ea41ff7d7a114f0f
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Sep 24 22:41:33 2016 +0300

    Remove unused whitelisted psql from tox.ini
    
    We now use createdb/dropdb instead of psql -c.

diff --git a/tox.ini b/tox.ini
index 161b285..4398dfa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,6 @@ passenv = CI TRAVIS TRAVIS_*
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     mysql
-    psql
     createdb
     dropdb
 

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

Summary of changes:
 tox.ini |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-31-g2a7e330

[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  2a7e330d0866c586171233c1dea1556d82bb3f9a (commit)
       via  0f7dee49771213302744d12239337e3331e1d528 (commit)
       via  1f969aa2d3671ca68397f0ed3d356df80f6bb48f (commit)
      from  4d9d438a43d28cc346a1995dc744d00265cb2c29 (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/2a7e330d0866c586171233c1dea1556d82bb3f9a

commit 2a7e330d0866c586171233c1dea1556d82bb3f9a
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Sep 24 17:39:03 2016 +0300

    Run tests at Circle CI in parallel
    
    Circle CI generously allows 4 parallel containers for free software
    projects hosted at GitHub.

diff --git a/circle.yml b/circle.yml
index a62f7cd..c491717 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,3 +9,8 @@ dependencies:
     - pip install -U pip
     - pip install -U tox tox-pyenv
     - pyenv local 2.6.8 2.7.10 3.4.3 3.5.0
+
+test:
+  override:
+     - case $CIRCLE_NODE_INDEX in 0) tox -e '{py26,py27}-mysql,{py34,py35}-mysqlclient' ;; 1) tox -e '{py26,py27,py34,py35}-postgres' ;; 2) tox -e '{py26,py27,py34,py35}-sqlite' ;; 3) tox -e '{py27,py34}-flake8' ;; esac:
+        parallel: true
diff --git a/docs/News.rst b/docs/News.rst
index 982b07b..f837292 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -26,6 +26,8 @@ Tests
 
 * Tests are now run at CIs with python3.5.
 
+* Tests are split at Circle CI in 4 parallel containers.
+
 * Fix a problem in tests related to test order when running on PostgreSQL.
 
 * Restore mxDateTime installation in tox.ini

http://sourceforge.net/p/sqlobject/sqlobject/ci/0f7dee49771213302744d12239337e3331e1d528

commit 0f7dee49771213302744d12239337e3331e1d528
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Sep 24 18:13:21 2016 +0300

    Update docker key at Circle CI

diff --git a/circle.yml b/circle.yml
index a70900c..a62f7cd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,6 +2,8 @@ dependencies:
   cache_directories:
     - ~/.cache/pip
   override:
+    - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+    - sudo apt-key update
     - sudo apt-get -qq update
     - sudo apt-get install -y python-egenix-mxdatetime python-mysqldb python-psycopg2 python3-psycopg2
     - pip install -U pip

http://sourceforge.net/p/sqlobject/sqlobject/ci/1f969aa2d3671ca68397f0ed3d356df80f6bb48f

commit 1f969aa2d3671ca68397f0ed3d356df80f6bb48f
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Sep 24 17:38:21 2016 +0300

    apt-get python3-psycopg2 for tests

diff --git a/.travis.yml b/.travis.yml
index bed2bac..35efcec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ env:
 
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y python-egenix-mxdatetime python-mysqldb python-psycopg2
+  - sudo apt-get install -y python-egenix-mxdatetime python-mysqldb python-psycopg2 python3-psycopg2
 
 install: pip install tox coveralls codecov
 
diff --git a/circle.yml b/circle.yml
index 361a090..a70900c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,7 @@ dependencies:
     - ~/.cache/pip
   override:
     - sudo apt-get -qq update
-    - sudo apt-get install -y python-egenix-mxdatetime python-mysqldb python-psycopg2
+    - sudo apt-get install -y python-egenix-mxdatetime python-mysqldb python-psycopg2 python3-psycopg2
     - pip install -U pip
     - pip install -U tox tox-pyenv
     - pyenv local 2.6.8 2.7.10 3.4.3 3.5.0

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

Summary of changes:
 .travis.yml   |    2 +-
 circle.yml    |    9 ++++++++-
 docs/News.rst |    2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-28-g4d9d438

[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  4d9d438a43d28cc346a1995dc744d00265cb2c29 (commit)
       via  e0f1af959b656206643223aa4bb56a5c8798c1a1 (commit)
       via  c766c7920291c6f69ea49b7840aa33a7508ae0f9 (commit)
      from  cf45abf77b98bc0d7a34a6da8b6d3697165bf962 (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/4d9d438a43d28cc346a1995dc744d00265cb2c29

commit 4d9d438a43d28cc346a1995dc744d00265cb2c29
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Sep 24 08:22:40 2016 +0300

    Use createdb/dropdb for Postgres

diff --git a/tox.ini b/tox.ini
index a0b0473..161b285 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,10 +4,6 @@ envlist = {py26,py27}-mysql,{py26,py27,py34,py35}-postgres,{py26,py27,py34,py35}
 
 # Base test environment settings
 [testenv]
-# Don't fail or warn on uninstalled commands
-whitelist_externals =
-    mysql
-    psql
 # Ensure we cd into sqlobject before running the tests
 changedir = ./sqlobject/
 deps =
@@ -21,6 +17,12 @@ deps =
     mysqlclient: mysqlclient
     postgres: psycopg2
 passenv = CI TRAVIS TRAVIS_*
+# Don't fail or warn on uninstalled commands
+whitelist_externals =
+    mysql
+    psql
+    createdb
+    dropdb
 
 # MySQL test environments
 [mysql]
@@ -38,9 +40,9 @@ commands = {[mysql]commands}
 # PostgreSQL test environments
 [postgresql]
 commands =
-    psql -c 'create database sqlobject_test;' -U postgres
+    createdb -U postgres sqlobject_test
     py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test tests include/tests inheritance/tests versioning/test
-    psql -c 'drop database sqlobject_test;' -U postgres
+    dropdb -U postgres sqlobject_test
 
 [testenv:py26-postgres]
 commands = {[postgresql]commands}

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

commit e0f1af959b656206643223aa4bb56a5c8798c1a1
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Sep 24 08:21:29 2016 +0300

    Remove basepython from tox.ini
    
    tox is quite good at guessing Python versions from environment names.

diff --git a/tox.ini b/tox.ini
index 9d3ee6d..a0b0473 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,11 +10,6 @@ whitelist_externals =
     psql
 # Ensure we cd into sqlobject before running the tests
 changedir = ./sqlobject/
-basepython =
-    py26: python2.6
-    py27: python2.7
-    py34: python3.4
-    py35: python3.5
 deps =
     pytest
     pytest-cov

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

commit c766c7920291c6f69ea49b7840aa33a7508ae0f9
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Sep 24 01:44:10 2016 +0300

    Reorder .gitignore alphabetically

diff --git a/.gitignore b/.gitignore
index d726343..8647366 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 /.cache/
 /.tox/
-*~
-*.tmp
-*.py[co]
-/MANIFEST
 /SQLObject.egg-info/
 /build/
 /data/
 /dist/
+/MANIFEST
+*.py[co]
+*.tmp
+*~

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

Summary of changes:
 .gitignore |    8 ++++----
 tox.ini    |   19 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-25-gcf45abf

[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  cf45abf77b98bc0d7a34a6da8b6d3697165bf962 (commit)
       via  ba944e6a18359969e0fc46d059da9a8e0a61617b (commit)
      from  02ed37636dd173e8836d84bd7bf18998d937352b (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/cf45abf77b98bc0d7a34a6da8b6d3697165bf962

commit cf45abf77b98bc0d7a34a6da8b6d3697165bf962
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Sep 23 17:04:29 2016 +0300

    The problem is related to neither tox nor Python 2.7.12
    
    The problem is reproducible now with any python and without tox.
    
    [skip ci]

diff --git a/docs/News.rst b/docs/News.rst
index c874a69..982b07b 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -26,7 +26,7 @@ Tests
 
 * Tests are now run at CIs with python3.5.
 
-* Fix tests under Python 2.7.12 + tox + PostgreSQL.
+* Fix a problem in tests related to test order when running on PostgreSQL.
 
 * Restore mxDateTime installation in tox.ini
   (was removed while egenix.com was down).

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

commit ba944e6a18359969e0fc46d059da9a8e0a61617b
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Sep 23 05:51:23 2016 +0300

    Rename testDestroyCascade.py -> test_destroy_cascade.py

diff --git a/sqlobject/inheritance/tests/testDestroyCascade.py b/sqlobject/inheritance/tests/test_destroy_cascade.py
similarity index 100%
rename from sqlobject/inheritance/tests/testDestroyCascade.py
rename to sqlobject/inheritance/tests/test_destroy_cascade.py

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

Summary of changes:
 docs/News.rst                                      |    2 +-
 ...stDestroyCascade.py => test_destroy_cascade.py} |    0
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename sqlobject/inheritance/tests/{testDestroyCascade.py => test_destroy_cascade.py} (100%)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-23-g02ed376

[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  02ed37636dd173e8836d84bd7bf18998d937352b (commit)
      from  804bfd1762c8316393c3fa8815a54f73df6bada8 (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/02ed37636dd173e8836d84bd7bf18998d937352b

commit 02ed37636dd173e8836d84bd7bf18998d937352b
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Sep 22 23:37:58 2016 +0300

    Remove SQLObjectClass from conftest.py
    
    It's no longer required - we don't have any non-test class named TestXXX.

diff --git a/sqlobject/conftest.py b/sqlobject/conftest.py
index 1d9dc26..bcd2f7b 100644
--- a/sqlobject/conftest.py
+++ b/sqlobject/conftest.py
@@ -3,12 +3,9 @@ This module is used by py.test to configure testing for this
 application.
 """
 
-import py
-import sqlobject
-
 try:
     import pkg_resources
-except ImportError:  # Python 2.2
+except ImportError:
     pass
 else:
     pkg_resources.require('SQLObject')
@@ -65,16 +62,6 @@ def pytest_configure(config):
     option = config.option
 
 
-class SQLObjectClass(py.test.collect.Class):
-    def run(self):
-        if (isinstance(self.obj, type) and
-                issubclass(self.obj, sqlobject.SQLObject)):
-            return []
-        return super(SQLObjectClass, self).run()
-
-Class = SQLObjectClass
-
-
 def setup_tests():
     if option.debug_events:
         from sqlobject import events

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

Summary of changes:
 sqlobject/conftest.py |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-22-g804bfd1

[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  804bfd1762c8316393c3fa8815a54f73df6bada8 (commit)
       via  3fdf20c184044eff4318426b4c5dbe4cbb450f30 (commit)
       via  5535bb5c62cb8d4f60bf6c865bd6c3313129ef92 (commit)
      from  66225e81c0b29a2e7a5c89ecff72f8f90e409a3a (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/804bfd1762c8316393c3fa8815a54f73df6bada8

commit 804bfd1762c8316393c3fa8815a54f73df6bada8
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Sep 22 01:36:46 2016 +0300

    Ignore .cache and .tox directories only at the top
    
    Ignore other directories as directories.

diff --git a/.gitignore b/.gitignore
index 52d4a58..d726343 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
+/.cache/
+/.tox/
 *~
 *.tmp
-*.pyc
-*.pyo
+*.py[co]
 /MANIFEST
-/SQLObject.egg-info
-/build
-/data
-/dist
-/temp
+/SQLObject.egg-info/
+/build/
+/data/
+/dist/

http://sourceforge.net/p/sqlobject/sqlobject/ci/3fdf20c184044eff4318426b4c5dbe4cbb450f30

commit 3fdf20c184044eff4318426b4c5dbe4cbb450f30
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Sep 22 01:32:35 2016 +0300

    Fix py.test warnings by converting yield test to plain calls
    
    yield test were deprecated in py.test.

diff --git a/docs/News.rst b/docs/News.rst
index 4ef98ab..c874a69 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -21,6 +21,9 @@ Tests
 * Great Renaming: fix py.test warnings by renaming TestXXX classes
   to SOTestXXX to prevent py.test to recognize them as test classes.
 
+* Fix py.test warnings by converting yield test to plain calls:
+  yield test were deprecated in py.test.
+
 * Tests are now run at CIs with python3.5.
 
 * Fix tests under Python 2.7.12 + tox + PostgreSQL.
diff --git a/sqlobject/tests/test_default_style.py b/sqlobject/tests/test_default_style.py
index 3d9d9ad..bd71176 100644
--- a/sqlobject/tests/test_default_style.py
+++ b/sqlobject/tests/test_default_style.py
@@ -61,5 +61,5 @@ class DefaultStyleTest(SQLObject):
 def test_default_styles():
     make_columns()
     for style in styles:
-        yield do_col_test, DefaultStyleTest, style, styles[style]
-        yield do_fkey_test, DefaultStyleTest, style, fkeys[style]
+        do_col_test(DefaultStyleTest, style, styles[style])
+        do_fkey_test(DefaultStyleTest, style, fkeys[style])
diff --git a/sqlobject/tests/test_sqlbuilder_dbspecific.py b/sqlobject/tests/test_sqlbuilder_dbspecific.py
index 814af01..d8e4913 100644
--- a/sqlobject/tests/test_sqlbuilder_dbspecific.py
+++ b/sqlobject/tests/test_sqlbuilder_dbspecific.py
@@ -35,32 +35,32 @@ def checkCount(q, c, msg=''):
 
 def testSimple():
     setupClass(SBButton)
-    yield checkCount, makeClause(), 1
-    yield checkCount, makeSelect(), 1
+    checkCount(makeClause(), 1)
+    checkCount(makeSelect(), 1)
 
 
 def testMiscOps():
     setupClass(SBButton)
-    yield checkCount, AND(makeClause(), makeClause()), 2
-    yield checkCount, AND(makeClause(), EXISTS(makeSelect())), 2
+    checkCount(AND(makeClause(), makeClause()), 2)
+    checkCount(AND(makeClause(), EXISTS(makeSelect())), 2)
 
 
 def testAliased():
     setupClass(SBButton)
     b = Alias(makeSelect(), 'b')
-    yield checkCount, b, 1
-    yield checkCount, Select(b.q.id), 1
+    checkCount(b, 1)
+    checkCount(Select(b.q.id), 1)
 
     # Table1 & Table2 are treated individually in joins
-    yield checkCount, JOIN(None, b), 1
-    yield checkCount, JOIN(b, SBButton), 1
-    yield checkCount, JOIN(SBButton, b), 1
-    yield checkCount, LEFTJOINOn(None, b, SBButton.q.id == b.q.id), 1
-    yield checkCount, LEFTJOINOn(b, SBButton, SBButton.q.id == b.q.id), 1
-    yield checkCount, LEFTJOINOn(SBButton, b, SBButton.q.id == b.q.id), 1
+    checkCount(JOIN(None, b), 1)
+    checkCount(JOIN(b, SBButton), 1)
+    checkCount(JOIN(SBButton, b), 1)
+    checkCount(LEFTJOINOn(None, b, SBButton.q.id == b.q.id), 1)
+    checkCount(LEFTJOINOn(b, SBButton, SBButton.q.id == b.q.id), 1)
+    checkCount(LEFTJOINOn(SBButton, b, SBButton.q.id == b.q.id), 1)
 
 
 def testTablesUsedSResults():
     setupClass(SBButton)
 
-    yield checkCount, SBButton.select(makeClause()).queryForSelect(), 1
+    checkCount(SBButton.select(makeClause()).queryForSelect(), 1)

http://sourceforge.net/p/sqlobject/sqlobject/ci/5535bb5c62cb8d4f60bf6c865bd6c3313129ef92

commit 5535bb5c62cb8d4f60bf6c865bd6c3313129ef92
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Sep 22 00:38:09 2016 +0300

    Fix py.test warnings by renaming TestXXX classes to SOTestXXX

diff --git a/docs/News.rst b/docs/News.rst
index 0412df1..4ef98ab 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -18,6 +18,9 @@ Documentation
 Tests
 -----
 
+* Great Renaming: fix py.test warnings by renaming TestXXX classes
+  to SOTestXXX to prevent py.test to recognize them as test classes.
+
 * Tests are now run at CIs with python3.5.
 
 * Fix tests under Python 2.7.12 + tox + PostgreSQL.
diff --git a/sqlobject/inheritance/tests/testDestroyCascade.py b/sqlobject/inheritance/tests/testDestroyCascade.py
index cc138d7..3291127 100644
--- a/sqlobject/inheritance/tests/testDestroyCascade.py
+++ b/sqlobject/inheritance/tests/testDestroyCascade.py
@@ -3,21 +3,21 @@ from sqlobject.inheritance import InheritableSQLObject
 from sqlobject.tests.dbtest import setupClass
 
 
-class TestCascade1(InheritableSQLObject):
+class SOTestCascade1(InheritableSQLObject):
     dummy = IntCol()
 
 
-class TestCascade2(TestCascade1):
-    c = ForeignKey('TestCascade3', cascade='null')
+class SOTestCascade2(SOTestCascade1):
+    c = ForeignKey('SOTestCascade3', cascade='null')
 
 
-class TestCascade3(SQLObject):
+class SOTestCascade3(SQLObject):
     dummy = IntCol()
 
 
 def test_destroySelf():
-    setupClass([TestCascade1, TestCascade3, TestCascade2])
+    setupClass([SOTestCascade1, SOTestCascade3, SOTestCascade2])
 
-    c = TestCascade3(dummy=1)
-    TestCascade2(cID=c.id, dummy=1)
+    c = SOTestCascade3(dummy=1)
+    SOTestCascade2(cID=c.id, dummy=1)
     c.destroySelf()
diff --git a/sqlobject/inheritance/tests/test_aggregates.py b/sqlobject/inheritance/tests/test_aggregates.py
index 9465363..a430aac 100644
--- a/sqlobject/inheritance/tests/test_aggregates.py
+++ b/sqlobject/inheritance/tests/test_aggregates.py
@@ -3,21 +3,21 @@ from sqlobject.inheritance import InheritableSQLObject
 from sqlobject.tests.dbtest import raises, setupClass
 
 
-class TestAggregate1(InheritableSQLObject):
+class SOTestAggregate1(InheritableSQLObject):
     value1 = IntCol()
 
 
-class TestAggregate2(TestAggregate1):
+class SOTestAggregate2(SOTestAggregate1):
     value2 = IntCol()
 
 
 def test_aggregates():
-    setupClass([TestAggregate1, TestAggregate2])
+    setupClass([SOTestAggregate1, SOTestAggregate2])
 
-    TestAggregate1(value1=1)
-    TestAggregate2(value1=2, value2=12)
+    SOTestAggregate1(value1=1)
+    SOTestAggregate2(value1=2, value2=12)
 
-    assert TestAggregate1.select().max("value1") == 2
-    assert TestAggregate2.select().max("value1") == 2
-    raises(Exception, TestAggregate2.select().max, "value2")
-    assert TestAggregate2.select().max(TestAggregate2.q.value2) == 12
+    assert SOTestAggregate1.select().max("value1") == 2
+    assert SOTestAggregate2.select().max("value1") == 2
+    raises(Exception, SOTestAggregate2.select().max, "value2")
+    assert SOTestAggregate2.select().max(SOTestAggregate2.q.value2) == 12
diff --git a/sqlobject/inheritance/tests/test_foreignKey.py b/sqlobject/inheritance/tests/test_foreignKey.py
index 91c7f3b..c1f70e1 100644
--- a/sqlobject/inheritance/tests/test_foreignKey.py
+++ b/sqlobject/inheritance/tests/test_foreignKey.py
@@ -79,16 +79,16 @@ def test_foreignKey():
     assert employee.count() == 2
 
 
-class TestInheritableBase(InheritableSQLObject):
+class SOTestInheritableBase(InheritableSQLObject):
     pass
 
 
-class TestInheritableForeignKey(TestInheritableBase):
-    base = ForeignKey("TestInheritableBase")
+class SOTestInheritableForeignKey(SOTestInheritableBase):
+    base = ForeignKey("SOTestInheritableBase")
 
 
 def test_foreignKey2():
-    setupClass([TestInheritableBase, TestInheritableForeignKey])
+    setupClass([SOTestInheritableBase, SOTestInheritableForeignKey])
 
-    test = TestInheritableBase()
-    TestInheritableForeignKey(base=test)
+    test = SOTestInheritableBase()
+    SOTestInheritableForeignKey(base=test)
diff --git a/sqlobject/tests/test_ForeignKey.py b/sqlobject/tests/test_ForeignKey.py
index a37fef3..0e80275 100644
--- a/sqlobject/tests/test_ForeignKey.py
+++ b/sqlobject/tests/test_ForeignKey.py
@@ -4,120 +4,121 @@ from sqlobject.tests.dbtest import getConnection, InstalledTestDatabase, \
     raises, setupClass, setupCyclicClasses
 
 
-class TestComposerKey(SQLObject):
+class SOTestComposerKey(SQLObject):
     name = StringCol()
     id2 = IntCol(default=None, unique=True)
 
 
-class TestWorkKey(SQLObject):
+class SOTestWorkKey(SQLObject):
     class sqlmeta:
         idName = "work_id"
 
-    composer = ForeignKey('TestComposerKey', cascade=True)
+    composer = ForeignKey('SOTestComposerKey', cascade=True)
     title = StringCol()
 
 
-class TestWorkKey2(SQLObject):
+class SOTestWorkKey2(SQLObject):
     title = StringCol()
 
 
-class TestOtherColumn(SQLObject):
-    key1 = ForeignKey('TestComposerKey', default=None)
-    key2 = ForeignKey('TestComposerKey', refColumn='id2', default=None)
+class SOTestOtherColumn(SQLObject):
+    key1 = ForeignKey('SOTestComposerKey', default=None)
+    key2 = ForeignKey('SOTestComposerKey', refColumn='id2', default=None)
 
 
 def test1():
-    setupClass([TestComposerKey, TestWorkKey])
+    setupClass([SOTestComposerKey, SOTestWorkKey])
 
-    c = TestComposerKey(name='Mahler, Gustav')
-    w1 = TestWorkKey(composer=c, title='Symphony No. 9')
-    w2 = TestWorkKey(composer=None, title=None)
+    c = SOTestComposerKey(name='Mahler, Gustav')
+    w1 = SOTestWorkKey(composer=c, title='Symphony No. 9')
+    w2 = SOTestWorkKey(composer=None, title=None)
 
     # Select by usual way
-    s = TestWorkKey.selectBy(composerID=c.id, title='Symphony No. 9')
+    s = SOTestWorkKey.selectBy(composerID=c.id, title='Symphony No. 9')
     assert s.count() == 1
     assert s[0] == w1
     # selectBy object.id
-    s = TestWorkKey.selectBy(composer=c.id, title='Symphony No. 9')
+    s = SOTestWorkKey.selectBy(composer=c.id, title='Symphony No. 9')
     assert s.count() == 1
     assert s[0] == w1
     # selectBy object
-    s = TestWorkKey.selectBy(composer=c, title='Symphony No. 9')
+    s = SOTestWorkKey.selectBy(composer=c, title='Symphony No. 9')
     assert s.count() == 1
     assert s[0] == w1
     # selectBy id
-    s = TestWorkKey.selectBy(id=w1.id)
+    s = SOTestWorkKey.selectBy(id=w1.id)
     assert s.count() == 1
     assert s[0] == w1
     # is None handled correctly?
-    s = TestWorkKey.selectBy(composer=None, title=None)
+    s = SOTestWorkKey.selectBy(composer=None, title=None)
     assert s.count() == 1
     assert s[0] == w2
 
-    s = TestWorkKey.selectBy()
+    s = SOTestWorkKey.selectBy()
     assert s.count() == 2
 
     # select with objects
-    s = TestWorkKey.select(TestWorkKey.q.composerID == c.id)
+    s = SOTestWorkKey.select(SOTestWorkKey.q.composerID == c.id)
     assert s.count() == 1
     assert s[0] == w1
-    s = TestWorkKey.select(TestWorkKey.q.composer == c.id)
+    s = SOTestWorkKey.select(SOTestWorkKey.q.composer == c.id)
     assert s.count() == 1
     assert s[0] == w1
-    s = TestWorkKey.select(TestWorkKey.q.composerID == c)
+    s = SOTestWorkKey.select(SOTestWorkKey.q.composerID == c)
     assert s.count() == 1
     assert s[0] == w1
-    s = TestWorkKey.select(TestWorkKey.q.composer == c)
+    s = SOTestWorkKey.select(SOTestWorkKey.q.composer == c)
     assert s.count() == 1
     assert s[0] == w1
-    s = TestWorkKey.select(
-        (TestWorkKey.q.composer == c) &
-        (TestWorkKey.q.title == 'Symphony No. 9'))
+    s = SOTestWorkKey.select(
+        (SOTestWorkKey.q.composer == c) &
+        (SOTestWorkKey.q.title == 'Symphony No. 9'))
     assert s.count() == 1
     assert s[0] == w1
 
 
 def test2():
-    TestWorkKey._connection = getConnection()
-    InstalledTestDatabase.drop(TestWorkKey)
-    setupClass([TestComposerKey, TestWorkKey2], force=True)
-    TestWorkKey2.sqlmeta.addColumn(ForeignKey('TestComposerKey'),
-                                   changeSchema=True)
+    SOTestWorkKey._connection = getConnection()
+    InstalledTestDatabase.drop(SOTestWorkKey)
+    setupClass([SOTestComposerKey, SOTestWorkKey2], force=True)
+    SOTestWorkKey2.sqlmeta.addColumn(ForeignKey('SOTestComposerKey'),
+                                     changeSchema=True)
 
 
 def test_otherColumn():
-    setupClass([TestComposerKey, TestOtherColumn])
-    test_composer1 = TestComposerKey(name='Test1')
-    test_composer2 = TestComposerKey(name='Test2', id2=2)
-    test_fkey = TestOtherColumn(key1=test_composer1)
-    test_other = TestOtherColumn(key2=test_composer2.id2)
+    setupClass([SOTestComposerKey, SOTestOtherColumn])
+    test_composer1 = SOTestComposerKey(name='Test1')
+    test_composer2 = SOTestComposerKey(name='Test2', id2=2)
+    test_fkey = SOTestOtherColumn(key1=test_composer1)
+    test_other = SOTestOtherColumn(key2=test_composer2.id2)
     getConnection().cache.clear()
     assert test_fkey.key1 == test_composer1
     assert test_other.key2 == test_composer2
 
 
-class TestFKValidationA(SQLObject):
+class SOTestFKValidationA(SQLObject):
     name = StringCol()
-    bfk = ForeignKey("TestFKValidationB")
-    cfk = ForeignKey("TestFKValidationC", default=None)
+    bfk = ForeignKey("SOTestFKValidationB")
+    cfk = ForeignKey("SOTestFKValidationC", default=None)
 
 
-class TestFKValidationB(SQLObject):
+class SOTestFKValidationB(SQLObject):
     name = StringCol()
-    afk = ForeignKey("TestFKValidationA")
+    afk = ForeignKey("SOTestFKValidationA")
 
 
-class TestFKValidationC(SQLObject):
+class SOTestFKValidationC(SQLObject):
     class sqlmeta:
         idType = str
     name = StringCol()
 
 
 def test_foreignkey_validation():
-    setupCyclicClasses(TestFKValidationA, TestFKValidationB, TestFKValidationC)
-    a = TestFKValidationA(name="testa", bfk=None)
-    b = TestFKValidationB(name="testb", afk=a)
-    c = TestFKValidationC(id='testc', name="testc")
+    setupCyclicClasses(SOTestFKValidationA, SOTestFKValidationB,
+                       SOTestFKValidationC)
+    a = SOTestFKValidationA(name="testa", bfk=None)
+    b = SOTestFKValidationB(name="testb", afk=a)
+    c = SOTestFKValidationC(id='testc', name="testc")
     a.bfk = b
     a.cfk = c
     assert a.bfk == b
@@ -125,8 +126,8 @@ def test_foreignkey_validation():
     assert b.afk == a
 
     raises(validators.Invalid,
-           TestFKValidationA, name="testa", bfk='testb', cfk='testc')
+           SOTestFKValidationA, name="testa", bfk='testb', cfk='testc')
 
-    a = TestFKValidationA(name="testa", bfk=1, cfk='testc')
+    a = SOTestFKValidationA(name="testa", bfk=1, cfk='testc')
     assert a.bfkID == 1
     assert a.cfkID == 'testc'
diff --git a/sqlobject/tests/test_NoneValuedResultItem.py b/sqlobject/tests/test_NoneValuedResultItem.py
index 3e29636..9a6dc5d 100644
--- a/sqlobject/tests/test_NoneValuedResultItem.py
+++ b/sqlobject/tests/test_NoneValuedResultItem.py
@@ -4,28 +4,30 @@ from sqlobject import ForeignKey, SQLObject, StringCol, sqlbuilder
 from sqlobject.tests.dbtest import setupClass
 
 
-class TestComposer(SQLObject):
+class SOTestComposer(SQLObject):
     name = StringCol()
 
 
-class TestWork(SQLObject):
+class SOTestWork(SQLObject):
     class sqlmeta:
         idName = "work_id"
 
-    composer = ForeignKey('TestComposer')
+    composer = ForeignKey('SOTestComposer')
     title = StringCol()
 
 
 def test1():
-    setupClass([TestComposer,
-                TestWork])
+    setupClass([SOTestComposer,
+                SOTestWork])
 
-    c = TestComposer(name='Mahler, Gustav')
-    w = TestWork(composer=c, title='Symphony No. 9')
-    TestComposer(name='Bruckner, Anton')
+    c = SOTestComposer(name='Mahler, Gustav')
+    w = SOTestWork(composer=c, title='Symphony No. 9')
+    SOTestComposer(name='Bruckner, Anton')
     # but don't add any works for Bruckner
 
     # do a left join, a common use case that often involves NULL results
-    s = TestWork.select(join=sqlbuilder.LEFTJOINOn(TestComposer, TestWork,
-                        TestComposer.q.id == TestWork.q.composerID))
+    s = SOTestWork.select(
+        join=sqlbuilder.LEFTJOINOn(
+            SOTestComposer, SOTestWork,
+            SOTestComposer.q.id == SOTestWork.q.composerID))
     assert tuple(s) == (w, None)
diff --git a/sqlobject/tests/test_asdict.py b/sqlobject/tests/test_asdict.py
index 262f189..c6b3827 100644
--- a/sqlobject/tests/test_asdict.py
+++ b/sqlobject/tests/test_asdict.py
@@ -7,12 +7,12 @@ from sqlobject.tests.dbtest import setupClass
 ########################################
 
 
-class TestAsDict(SQLObject):
+class SOTestAsDict(SQLObject):
     name = StringCol(length=10)
     name2 = StringCol(length=10)
 
 
 def test_asDict():
-    setupClass(TestAsDict, force=True)
-    t1 = TestAsDict(name='one', name2='1')
+    setupClass(SOTestAsDict, force=True)
+    t1 = SOTestAsDict(name='one', name2='1')
     assert t1.sqlmeta.asDict() == dict(name='one', name2='1', id=1)
diff --git a/sqlobject/tests/test_basic.py b/sqlobject/tests/test_basic.py
index 5a12044..fff3f2e 100644
--- a/sqlobject/tests/test_basic.py
+++ b/sqlobject/tests/test_basic.py
@@ -5,7 +5,7 @@ from sqlobject import BoolCol, ForeignKey, IntCol, KeyCol, SQLObject, \
 from sqlobject.tests.dbtest import inserts, raises, setupClass, supports
 
... 1913 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-19-g66225e8

[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  66225e81c0b29a2e7a5c89ecff72f8f90e409a3a (commit)
       via  12479229ee900e282abae323a136b474c134a7e4 (commit)
      from  97c8bde97cf09e61e8bceca075dd20c9cfead14d (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/66225e81c0b29a2e7a5c89ecff72f8f90e409a3a

commit 66225e81c0b29a2e7a5c89ecff72f8f90e409a3a
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Sep 11 03:13:39 2016 +0300

    Run tests with python3.5

diff --git a/.travis.yml b/.travis.yml
index 174ee10..bed2bac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,17 @@ addons:
 
 env:
   - TOXENV=py26-mysql
-  - TOXENV=py27-mysql
   - TOXENV=py26-postgres
-  - TOXENV=py27-postgres
   - TOXENV=py26-sqlite
+  - TOXENV=py27-mysql
+  - TOXENV=py27-postgres
   - TOXENV=py27-sqlite
-  - TOXENV=py34-sqlite
-  - TOXENV=py34-postgres
   - TOXENV=py34-mysqlclient
+  - TOXENV=py34-postgres
+  - TOXENV=py34-sqlite
+  - TOXENV=py35-mysqlclient
+  - TOXENV=py35-postgres
+  - TOXENV=py35-sqlite
   - TOXENV=py27-flake8
   - TOXENV=py34-flake8
 
diff --git a/circle.yml b/circle.yml
index 3400eee..361a090 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,4 +6,4 @@ dependencies:
     - sudo apt-get install -y python-egenix-mxdatetime python-mysqldb python-psycopg2
     - pip install -U pip
     - pip install -U tox tox-pyenv
-    - pyenv local 2.6.8 2.7.10 3.4.3
+    - pyenv local 2.6.8 2.7.10 3.4.3 3.5.0
diff --git a/docs/News.rst b/docs/News.rst
index 414c2a9..0412df1 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -18,6 +18,8 @@ Documentation
 Tests
 -----
 
+* Tests are now run at CIs with python3.5.
+
 * Fix tests under Python 2.7.12 + tox + PostgreSQL.
 
 * Restore mxDateTime installation in tox.ini
diff --git a/setup.py b/setup.py
index 0b0904d..a3a8cb2 100755
--- a/setup.py
+++ b/setup.py
@@ -81,6 +81,7 @@ and `GitHub <https://github.com/sqlobject>`_.
           "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
           "Programming Language :: Python :: 3.4",
+          "Programming Language :: Python :: 3.5",
           "Topic :: Database",
           "Topic :: Database :: Front-Ends",
           "Topic :: Software Development :: Libraries :: Python Modules",
diff --git a/tox.ini b/tox.ini
index 97c04d4..9d3ee6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27}-mysql,{py26,py27,py34}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-flake8,py34-mysqlclient
+envlist = {py26,py27}-mysql,{py26,py27,py34,py35}-postgres,{py26,py27,py34,py35}-sqlite,{py34,py35}-mysqlclient,{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -14,11 +14,12 @@ basepython =
     py26: python2.6
     py27: python2.7
     py34: python3.4
+    py35: python3.5
 deps =
     pytest
     pytest-cov
     py26,py27: FormEncode >= 1.1.1, != 1.3.0
-    py34: FormEncode >= 1.3.1
+    py34,py35: FormEncode >= 1.3.1
     PyDispatcher>=2.0.4
     py26,py27: egenix-mx-base
     mysql: mysql-python
@@ -55,6 +56,9 @@ commands = {[postgresql]commands}
 [testenv:py34-postgres]
 commands = {[postgresql]commands}
 
+[testenv:py35-postgres]
+commands = {[postgresql]commands}
+
 # SQLite test environments
 [sqlite]
 commands =
@@ -69,13 +73,22 @@ commands = {[sqlite]commands}
 [testenv:py34-sqlite]
 commands = {[sqlite]commands}
 
-# Special test environments
-[testenv:py34-mysqlclient]
+[testenv:py35-sqlite]
+commands = {[sqlite]commands}
+
+[mysqlclient]
 commands =
     mysql -e 'create database sqlobject_test;'
     py.test --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?charset=utf8
     mysql -e 'drop database sqlobject_test;'
 
+[testenv:py34-mysqlclient]
+commands = {[mysqlclient]commands}
+
+[testenv:py35-mysqlclient]
+commands = {[mysqlclient]commands}
+
+# Special test environments
 [testenv:py27-flake8]
 deps =
     flake8

http://sourceforge.net/p/sqlobject/sqlobject/ci/12479229ee900e282abae323a136b474c134a7e4

commit 12479229ee900e282abae323a136b474c134a7e4
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Sep 11 03:12:43 2016 +0300

    tox.ini: Remove basepython from flake8 environments

diff --git a/tox.ini b/tox.ini
index b9cd6b1..97c04d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -77,13 +77,11 @@ commands =
     mysql -e 'drop database sqlobject_test;'
 
 [testenv:py27-flake8]
-basepython = python2.7
 deps =
     flake8
 commands = flake8 .
 
 [testenv:py34-flake8]
-basepython = python3.4
 deps =
     flake8
 commands = flake8 .

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

Summary of changes:
 .travis.yml   |   11 +++++++----
 circle.yml    |    2 +-
 docs/News.rst |    2 ++
 setup.py      |    1 +
 tox.ini       |   23 +++++++++++++++++------
 5 files changed, 28 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-17-g97c8bde

[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  97c8bde97cf09e61e8bceca075dd20c9cfead14d (commit)
       via  6a6a8e1f1becb1931dfc1db028ffc71928b3a84b (commit)
      from  7d3eb307b5a2d55f5feefcbc231be2aa3953da02 (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/97c8bde97cf09e61e8bceca075dd20c9cfead14d

commit 97c8bde97cf09e61e8bceca075dd20c9cfead14d
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Aug 28 17:31:53 2016 +0300

    Radically simplify MANIFEST.in by using global-include
    
    [skip ci]

diff --git a/MANIFEST.in b/MANIFEST.in
index f77a140..b11dad3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,13 +1,6 @@
-include MANIFEST.in ez_setup.py
-include .travis.yml circle.yml tox.ini
-include *.rst *.txt docs/LICENSE docs/*.rst
+global-include *.py *.rst *.txt
+include docs/LICENSE MANIFEST.in .travis.yml circle.yml tox.ini
+include debian/* sqlobject/.coveragerc
 include docs/Makefile docs/genapidocs docs/rebuild
-include sqlobject/.coveragerc
-include sqlobject/maxdb/readme.txt
-recursive-include debian *
-recursive-include docs *.css *.html *.js *.gif *.png *.py *.txt
-recursive-include sqlobject/tests *.py
-recursive-include sqlobject/include/tests *.py
-recursive-include sqlobject/inheritance/tests *.py
-recursive-include sqlobject/versioning/test *.py
+recursive-include docs *.css *.html *.js *.gif *.png
 prune docs/_build
diff --git a/setup.cfg b/setup.cfg
index 2d27619..2513bb3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,3 +8,4 @@ exclude = .git,docs/europython/*.py,ez_setup.py
 
 [bdist_wheel]
 universal = 1
+

http://sourceforge.net/p/sqlobject/sqlobject/ci/6a6a8e1f1becb1931dfc1db028ffc71928b3a84b

commit 6a6a8e1f1becb1931dfc1db028ffc71928b3a84b
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Aug 28 16:04:49 2016 +0300

    News: The docs are now generated with Sphinx
    
    [skip ci]

diff --git a/docs/News.rst b/docs/News.rst
index b179041..414c2a9 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -10,6 +10,11 @@ News
 SQLObject 3.2.0 (master)
 ========================
 
+Documentation
+-------------
+
+* The docs are now generated with Sphinx.
+
 Tests
 -----
 

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

Summary of changes:
 MANIFEST.in   |   15 ++++-----------
 docs/News.rst |    5 +++++
 setup.cfg     |    1 +
 3 files changed, 10 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs deleted. 3.1.0-13-gf259a26

[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, sphinx-docs has been deleted
       was  f259a268dbc3ab7b68f2340df139d17dbe997233

- Log -----------------------------------------------------------------
f259a268dbc3ab7b68f2340df139d17dbe997233 Use this year for copyright year in docs
-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-15-g7d3eb30

[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  7d3eb307b5a2d55f5feefcbc231be2aa3953da02 (commit)
       via  f5fc6c8eef776931dd22c9cf1ab93feaa354f556 (commit)
       via  a4e233e002eaaae08536fd8173a8005684046b8b (commit)
       via  912c6b2b47a4ee8d65d268ee21eb38e391c708ad (commit)
       via  034dd3e20a9199593e89597d26b01774d14dae59 (commit)
       via  20d035deaf0f0b6e5d3d5163a3f15281b5dc6c95 (commit)
       via  9f3e13e88ae1aaff5b1060a5500ee7b6d38da573 (commit)
       via  6b889992e2ba68863aa5408446f4492c04a8c62b (commit)
       via  879ae2f2d60839f053f03c051bbb58f34072b856 (commit)
      from  f4c379f265918c016fe1df63194df38350dc753d (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/7d3eb307b5a2d55f5feefcbc231be2aa3953da02

commit 7d3eb307b5a2d55f5feefcbc231be2aa3953da02
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 26 21:31:18 2016 +0300

    Ignore flake8 warning E402: import not at the top
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index b0daf42..230944d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,7 +56,7 @@ copyright = u'2004-%d, %s' % (date.today().year, authors)
 # built documents.
 #
 sys.path.insert(0, os.path.abspath('..'))
-from sqlobject.__version__ import version as __version__
+from sqlobject.__version__ import version as __version__  # noqa: E402
 # The short X.Y version.
 version = '.'.join(__version__.split('.')[:2])
 # The full version, including alpha/beta/rc tags.

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

commit f5fc6c8eef776931dd22c9cf1ab93feaa354f556
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 13 08:06:47 2016 +0300

    Use this year for copyright year in docs
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index c71d051..b0daf42 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,6 +12,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from datetime import date
 import sys
 import os
 
@@ -48,7 +49,7 @@ master_doc = 'index'
 # General information about the project.
 project = u'SQLObject'
 authors = u'Ian Bicking and contributors'
-copyright = u'2004-2016, ' + authors
+copyright = u'2004-%d, %s' % (date.today().year, authors)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

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

commit a4e233e002eaaae08536fd8173a8005684046b8b
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 13 08:06:47 2016 +0300

    Deduce version/release for docs from __version__
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index 2ab636c..c71d051 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,8 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-# import sys
-# import os
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -54,10 +54,12 @@ copyright = u'2004-2016, ' + authors
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+sys.path.insert(0, os.path.abspath('..'))
+from sqlobject.__version__ import version as __version__
 # The short X.Y version.
-version = '3.1'
+version = '.'.join(__version__.split('.')[:2])
 # The full version, including alpha/beta/rc tags.
-release = '3.1.0b2'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

http://sourceforge.net/p/sqlobject/sqlobject/ci/912c6b2b47a4ee8d65d268ee21eb38e391c708ad

commit 912c6b2b47a4ee8d65d268ee21eb38e391c708ad
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:42:35 2016 +0300

    Build docs from the current sources
    
    [skip ci]

diff --git a/docs/rebuild b/docs/rebuild
index 26a8a08..1270384 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-make html &&
+PYTHONPATH=.. make html &&
 find . -name \*.tmp -type f -delete &&
 exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .

http://sourceforge.net/p/sqlobject/sqlobject/ci/034dd3e20a9199593e89597d26b01774d14dae59

commit 034dd3e20a9199593e89597d26b01774d14dae59
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:40:29 2016 +0300

    Change index: add toctree and indices
    
    [skip ci]

diff --git a/docs/index.rst b/docs/index.rst
index ff0f463..25c07dd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,23 +13,26 @@ applications.
 Documentation
 =============
 
-* `Download <download.html>`_
-* `Mailing list, bugs, etc. <community.html>`_
-* `Related projects and articles <links.html>`_
-
-* `News and updates <News.html>`_
-* `SQLObject and Python 3 <Python3.html>`_
-* `Main SQLObject documentation <SQLObject.html>`_
-* `Frequently Asked Questions <FAQ.html>`_
-* `sqlbuilder documentation <SQLBuilder.html>`_
-* `select() and SelectResults <SelectResults.html>`_
-* `sqlobject-admin documentation <sqlobject-admin.html>`_
-* `Inheritance <Inheritance.html>`_
-* `Versioning <Versioning.html>`_
-* `Views <Views.html>`_
-* `Developer Guide <DeveloperGuide.html>`_
-* `Contributors <Authors.html>`_
-* `TODO <TODO.html>`_
+.. toctree::
+   :maxdepth: 1
+
+   download
+   community
+   links
+
+   News
+   Python3
+   SQLObject
+   FAQ
+   SQLBuilder
+   SelectResults
+   sqlobject-admin
+   Inheritance
+   Versioning
+   Views
+   DeveloperGuide
+   Authors
+   TODO
 
 Example
 =======
@@ -65,6 +68,15 @@ Here's how you'd use the object::
   >>> p is p2
   True
 
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+
 .. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
    :target: https://sourceforge.net/projects/sqlobject
    :class: noborder

http://sourceforge.net/p/sqlobject/sqlobject/ci/20d035deaf0f0b6e5d3d5163a3f15281b5dc6c95

commit 20d035deaf0f0b6e5d3d5163a3f15281b5dc6c95
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:39:38 2016 +0300

    Copy _build/html to docs to include into sdist and eggs
    
    [skip ci]

diff --git a/docs/.gitignore b/docs/.gitignore
index bbbd193..113e221 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +1,3 @@
 /_build/
 /data.db
+/html
diff --git a/docs/rebuild b/docs/rebuild
index f041d0d..26a8a08 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -1,4 +1,5 @@
 #! /bin/sh
 
 make html &&
-exec find . -name \*.tmp -type f -delete
+find . -name \*.tmp -type f -delete &&
+exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .
diff --git a/setup.py b/setup.py
index 5e39636..0b0904d 100755
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,32 @@ and `GitHub <https://github.com/sqlobject>`_.
       package_data={"sqlobject":
                     [
                         "../docs/LICENSE", "../docs/*.rst", "../docs/*.css",
+                        "../docs/html/*",
+                        "../docs/html/_sources/*",
+                        "../docs/html/_sources/api/*",
+                        "../docs/html/_modules/*",
+                        "../docs/html/_modules/sqlobject/*",
+                        "../docs/html/_modules/sqlobject/mysql/*",
+                        "../docs/html/_modules/sqlobject/postgres/*",
+                        "../docs/html/_modules/sqlobject/manager/*",
+                        "../docs/html/_modules/sqlobject/inheritance/*",
+                        "../docs/html/_modules/sqlobject/inheritance/tests/*",
+                        "../docs/html/_modules/sqlobject/mssql/*",
+                        "../docs/html/_modules/sqlobject/tests/*",
+                        "../docs/html/_modules/sqlobject/rdbhost/*",
+                        "../docs/html/_modules/sqlobject/versioning/*",
+                        "../docs/html/_modules/sqlobject/versioning/test/*",
+                        "../docs/html/_modules/sqlobject/util/*",
+                        "../docs/html/_modules/sqlobject/maxdb/*",
+                        "../docs/html/_modules/sqlobject/firebird/*",
+                        "../docs/html/_modules/sqlobject/sybase/*",
+                        "../docs/html/_modules/sqlobject/sqlite/*",
+                        "../docs/html/_modules/sqlobject/include/*",
+                        "../docs/html/_modules/sqlobject/include/tests/*",
+                        "../docs/html/_modules/pydispatch/*",
+                        "../docs/html/_modules/_pytest/*",
+                        "../docs/html/api/*",
+                        "../docs/html/_static/*",
                     ],
                     "sqlobject.maxdb": ["readme.txt"],
                     },

http://sourceforge.net/p/sqlobject/sqlobject/ci/9f3e13e88ae1aaff5b1060a5500ee7b6d38da573

commit 9f3e13e88ae1aaff5b1060a5500ee7b6d38da573
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:37:15 2016 +0300

    Use Sphinx autodoc extension to build modules' docs from docstrings
    
    [skip ci]

diff --git a/MANIFEST.in b/MANIFEST.in
index 7090e7c..f77a140 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include MANIFEST.in ez_setup.py
 include .travis.yml circle.yml tox.ini
 include *.rst *.txt docs/LICENSE docs/*.rst
-include docs/Makefile docs/rebuild
+include docs/Makefile docs/genapidocs docs/rebuild
 include sqlobject/.coveragerc
 include sqlobject/maxdb/readme.txt
 recursive-include debian *
diff --git a/docs/api/modules.rst b/docs/api/modules.rst
new file mode 100644
index 0000000..656ed22
--- /dev/null
+++ b/docs/api/modules.rst
@@ -0,0 +1,7 @@
+sqlobject
+=========
+
+.. toctree::
+   :maxdepth: 4
+
+   sqlobject
diff --git a/docs/api/sqlobject.boundattributes.rst b/docs/api/sqlobject.boundattributes.rst
new file mode 100644
index 0000000..1518f8d
--- /dev/null
+++ b/docs/api/sqlobject.boundattributes.rst
@@ -0,0 +1,7 @@
+sqlobject.boundattributes module
+================================
+
+.. automodule:: sqlobject.boundattributes
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.cache.rst b/docs/api/sqlobject.cache.rst
new file mode 100644
index 0000000..6c74d5b
--- /dev/null
+++ b/docs/api/sqlobject.cache.rst
@@ -0,0 +1,7 @@
+sqlobject.cache module
+======================
+
+.. automodule:: sqlobject.cache
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.classregistry.rst b/docs/api/sqlobject.classregistry.rst
new file mode 100644
index 0000000..0882491
--- /dev/null
+++ b/docs/api/sqlobject.classregistry.rst
@@ -0,0 +1,7 @@
+sqlobject.classregistry module
+==============================
+
+.. automodule:: sqlobject.classregistry
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.col.rst b/docs/api/sqlobject.col.rst
new file mode 100644
index 0000000..5282fc2
--- /dev/null
+++ b/docs/api/sqlobject.col.rst
@@ -0,0 +1,7 @@
+sqlobject.col module
+====================
+
+.. automodule:: sqlobject.col
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.compat.rst b/docs/api/sqlobject.compat.rst
new file mode 100644
index 0000000..cdb4f6d
--- /dev/null
+++ b/docs/api/sqlobject.compat.rst
@@ -0,0 +1,7 @@
+sqlobject.compat module
+=======================
+
+.. automodule:: sqlobject.compat
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.conftest.rst b/docs/api/sqlobject.conftest.rst
new file mode 100644
index 0000000..8e56428
--- /dev/null
+++ b/docs/api/sqlobject.conftest.rst
@@ -0,0 +1,7 @@
+sqlobject.conftest module
+=========================
+
+.. automodule:: sqlobject.conftest
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.constraints.rst b/docs/api/sqlobject.constraints.rst
new file mode 100644
index 0000000..ad39272
--- /dev/null
+++ b/docs/api/sqlobject.constraints.rst
@@ -0,0 +1,7 @@
+sqlobject.constraints module
+============================
+
+.. automodule:: sqlobject.constraints
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.converters.rst b/docs/api/sqlobject.converters.rst
new file mode 100644
index 0000000..82b5cff
--- /dev/null
+++ b/docs/api/sqlobject.converters.rst
@@ -0,0 +1,7 @@
+sqlobject.converters module
+===========================
+
+.. automodule:: sqlobject.converters
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dbconnection.rst b/docs/api/sqlobject.dbconnection.rst
new file mode 100644
index 0000000..6a6adc3
--- /dev/null
+++ b/docs/api/sqlobject.dbconnection.rst
@@ -0,0 +1,7 @@
+sqlobject.dbconnection module
+=============================
+
+.. automodule:: sqlobject.dbconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dberrors.rst b/docs/api/sqlobject.dberrors.rst
new file mode 100644
index 0000000..3035746
--- /dev/null
+++ b/docs/api/sqlobject.dberrors.rst
@@ -0,0 +1,7 @@
+sqlobject.dberrors module
+=========================
+
+.. automodule:: sqlobject.dberrors
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.declarative.rst b/docs/api/sqlobject.declarative.rst
new file mode 100644
index 0000000..9cc7e9b
--- /dev/null
+++ b/docs/api/sqlobject.declarative.rst
@@ -0,0 +1,7 @@
+sqlobject.declarative module
+============================
+
+.. automodule:: sqlobject.declarative
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.events.rst b/docs/api/sqlobject.events.rst
new file mode 100644
index 0000000..8c33239
--- /dev/null
+++ b/docs/api/sqlobject.events.rst
@@ -0,0 +1,7 @@
+sqlobject.events module
+=======================
+
+.. automodule:: sqlobject.events
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.firebirdconnection.rst b/docs/api/sqlobject.firebird.firebirdconnection.rst
new file mode 100644
index 0000000..6fdf26e
--- /dev/null
+++ b/docs/api/sqlobject.firebird.firebirdconnection.rst
@@ -0,0 +1,7 @@
+sqlobject.firebird.firebirdconnection module
+============================================
+
+.. automodule:: sqlobject.firebird.firebirdconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.rst b/docs/api/sqlobject.firebird.rst
new file mode 100644
index 0000000..78cec9a
--- /dev/null
+++ b/docs/api/sqlobject.firebird.rst
@@ -0,0 +1,15 @@
+sqlobject.firebird package
+==========================
+
+.. automodule:: sqlobject.firebird
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
... 2964 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs updated. 3.1.0-13-gf259a26

[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, sphinx-docs has been updated
  discards  84cf6f745235dc32cd40ecfd44bbc40b0dfa60d0 (commit)
  discards  4cb4fb286637fdffe2fc3ca919b89839192520aa (commit)
  discards  8b7623b5b97d0550dc688c8503dcdc9a0d82f5a9 (commit)
  discards  e707192eff744af257a1e12cad5747d854dddc43 (commit)
  discards  18424330a20d91ea6c9e469b6328ee716a62e7d3 (commit)
  discards  eb0edfc6849d4f4e38b3a37184aadc5c05c2a857 (commit)
  discards  eab5dc856b962ad3a5742e12671def3d63a8c216 (commit)
       via  f259a268dbc3ab7b68f2340df139d17dbe997233 (commit)
       via  5ec8ca049ea21fdbca0cb2d1eaccce08315b5f33 (commit)
       via  34af1f5afc74903efeb53dd269c59b8c8f892db0 (commit)
       via  2ab62f27716489e956e71a67661259c9cef1e599 (commit)
       via  e767eb6bf76d3a2d2397e14c1c3f977221bac0f8 (commit)
       via  7159e80efc261857128ee34e768d6b3860248f68 (commit)
       via  b27e3e5b22e054995c26ecbb3a4c2089177eec83 (commit)
       via  f4c379f265918c016fe1df63194df38350dc753d (commit)
       via  c0737d14122550cfe965d193d899c8ab0801999d (commit)
       via  e6e23b61934f7ef97a0c3471a8300b8505f2d3c5 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (84cf6f745235dc32cd40ecfd44bbc40b0dfa60d0)
            \
             N -- N -- N (f259a268dbc3ab7b68f2340df139d17dbe997233)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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/f259a268dbc3ab7b68f2340df139d17dbe997233

commit f259a268dbc3ab7b68f2340df139d17dbe997233
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 13 08:06:47 2016 +0300

    Use this year for copyright year in docs
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index c71d051..b0daf42 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,6 +12,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from datetime import date
 import sys
 import os
 
@@ -48,7 +49,7 @@ master_doc = 'index'
 # General information about the project.
 project = u'SQLObject'
 authors = u'Ian Bicking and contributors'
-copyright = u'2004-2016, ' + authors
+copyright = u'2004-%d, %s' % (date.today().year, authors)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

http://sourceforge.net/p/sqlobject/sqlobject/ci/5ec8ca049ea21fdbca0cb2d1eaccce08315b5f33

commit 5ec8ca049ea21fdbca0cb2d1eaccce08315b5f33
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 13 08:06:47 2016 +0300

    Deduce version/release for docs from __version__
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index 2ab636c..c71d051 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,8 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-# import sys
-# import os
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -54,10 +54,12 @@ copyright = u'2004-2016, ' + authors
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+sys.path.insert(0, os.path.abspath('..'))
+from sqlobject.__version__ import version as __version__
 # The short X.Y version.
-version = '3.1'
+version = '.'.join(__version__.split('.')[:2])
 # The full version, including alpha/beta/rc tags.
-release = '3.1.0b2'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

http://sourceforge.net/p/sqlobject/sqlobject/ci/34af1f5afc74903efeb53dd269c59b8c8f892db0

commit 34af1f5afc74903efeb53dd269c59b8c8f892db0
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:42:35 2016 +0300

    Build docs from the current sources
    
    [skip ci]

diff --git a/docs/rebuild b/docs/rebuild
index 26a8a08..1270384 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-make html &&
+PYTHONPATH=.. make html &&
 find . -name \*.tmp -type f -delete &&
 exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .

http://sourceforge.net/p/sqlobject/sqlobject/ci/2ab62f27716489e956e71a67661259c9cef1e599

commit 2ab62f27716489e956e71a67661259c9cef1e599
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:40:29 2016 +0300

    Change index: add toctree and indices
    
    [skip ci]

diff --git a/docs/index.rst b/docs/index.rst
index ff0f463..25c07dd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,23 +13,26 @@ applications.
 Documentation
 =============
 
-* `Download <download.html>`_
-* `Mailing list, bugs, etc. <community.html>`_
-* `Related projects and articles <links.html>`_
-
-* `News and updates <News.html>`_
-* `SQLObject and Python 3 <Python3.html>`_
-* `Main SQLObject documentation <SQLObject.html>`_
-* `Frequently Asked Questions <FAQ.html>`_
-* `sqlbuilder documentation <SQLBuilder.html>`_
-* `select() and SelectResults <SelectResults.html>`_
-* `sqlobject-admin documentation <sqlobject-admin.html>`_
-* `Inheritance <Inheritance.html>`_
-* `Versioning <Versioning.html>`_
-* `Views <Views.html>`_
-* `Developer Guide <DeveloperGuide.html>`_
-* `Contributors <Authors.html>`_
-* `TODO <TODO.html>`_
+.. toctree::
+   :maxdepth: 1
+
+   download
+   community
+   links
+
+   News
+   Python3
+   SQLObject
+   FAQ
+   SQLBuilder
+   SelectResults
+   sqlobject-admin
+   Inheritance
+   Versioning
+   Views
+   DeveloperGuide
+   Authors
+   TODO
 
 Example
 =======
@@ -65,6 +68,15 @@ Here's how you'd use the object::
   >>> p is p2
   True
 
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+
 .. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
    :target: https://sourceforge.net/projects/sqlobject
    :class: noborder

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

commit e767eb6bf76d3a2d2397e14c1c3f977221bac0f8
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:39:38 2016 +0300

    Copy _build/html to docs to include into sdist and eggs
    
    [skip ci]

diff --git a/docs/.gitignore b/docs/.gitignore
index bbbd193..113e221 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +1,3 @@
 /_build/
 /data.db
+/html
diff --git a/docs/rebuild b/docs/rebuild
index f041d0d..26a8a08 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -1,4 +1,5 @@
 #! /bin/sh
 
 make html &&
-exec find . -name \*.tmp -type f -delete
+find . -name \*.tmp -type f -delete &&
+exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .
diff --git a/setup.py b/setup.py
index 5e39636..0b0904d 100755
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,32 @@ and `GitHub <https://github.com/sqlobject>`_.
       package_data={"sqlobject":
                     [
                         "../docs/LICENSE", "../docs/*.rst", "../docs/*.css",
+                        "../docs/html/*",
+                        "../docs/html/_sources/*",
+                        "../docs/html/_sources/api/*",
+                        "../docs/html/_modules/*",
+                        "../docs/html/_modules/sqlobject/*",
+                        "../docs/html/_modules/sqlobject/mysql/*",
+                        "../docs/html/_modules/sqlobject/postgres/*",
+                        "../docs/html/_modules/sqlobject/manager/*",
+                        "../docs/html/_modules/sqlobject/inheritance/*",
+                        "../docs/html/_modules/sqlobject/inheritance/tests/*",
+                        "../docs/html/_modules/sqlobject/mssql/*",
+                        "../docs/html/_modules/sqlobject/tests/*",
+                        "../docs/html/_modules/sqlobject/rdbhost/*",
+                        "../docs/html/_modules/sqlobject/versioning/*",
+                        "../docs/html/_modules/sqlobject/versioning/test/*",
+                        "../docs/html/_modules/sqlobject/util/*",
+                        "../docs/html/_modules/sqlobject/maxdb/*",
+                        "../docs/html/_modules/sqlobject/firebird/*",
+                        "../docs/html/_modules/sqlobject/sybase/*",
+                        "../docs/html/_modules/sqlobject/sqlite/*",
+                        "../docs/html/_modules/sqlobject/include/*",
+                        "../docs/html/_modules/sqlobject/include/tests/*",
+                        "../docs/html/_modules/pydispatch/*",
+                        "../docs/html/_modules/_pytest/*",
+                        "../docs/html/api/*",
+                        "../docs/html/_static/*",
                     ],
                     "sqlobject.maxdb": ["readme.txt"],
                     },

http://sourceforge.net/p/sqlobject/sqlobject/ci/7159e80efc261857128ee34e768d6b3860248f68

commit 7159e80efc261857128ee34e768d6b3860248f68
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:37:15 2016 +0300

    Use Sphinx autodoc extension to build modules' docs from docstrings
    
    [skip ci]

diff --git a/MANIFEST.in b/MANIFEST.in
index 7090e7c..f77a140 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include MANIFEST.in ez_setup.py
 include .travis.yml circle.yml tox.ini
 include *.rst *.txt docs/LICENSE docs/*.rst
-include docs/Makefile docs/rebuild
+include docs/Makefile docs/genapidocs docs/rebuild
 include sqlobject/.coveragerc
 include sqlobject/maxdb/readme.txt
 recursive-include debian *
diff --git a/docs/api/modules.rst b/docs/api/modules.rst
new file mode 100644
index 0000000..656ed22
--- /dev/null
+++ b/docs/api/modules.rst
@@ -0,0 +1,7 @@
+sqlobject
+=========
+
+.. toctree::
+   :maxdepth: 4
+
+   sqlobject
diff --git a/docs/api/sqlobject.boundattributes.rst b/docs/api/sqlobject.boundattributes.rst
new file mode 100644
index 0000000..1518f8d
--- /dev/null
+++ b/docs/api/sqlobject.boundattributes.rst
@@ -0,0 +1,7 @@
+sqlobject.boundattributes module
+================================
+
+.. automodule:: sqlobject.boundattributes
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.cache.rst b/docs/api/sqlobject.cache.rst
new file mode 100644
index 0000000..6c74d5b
--- /dev/null
+++ b/docs/api/sqlobject.cache.rst
@@ -0,0 +1,7 @@
+sqlobject.cache module
+======================
+
+.. automodule:: sqlobject.cache
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.classregistry.rst b/docs/api/sqlobject.classregistry.rst
new file mode 100644
index 0000000..0882491
--- /dev/null
+++ b/docs/api/sqlobject.classregistry.rst
@@ -0,0 +1,7 @@
+sqlobject.classregistry module
+==============================
+
+.. automodule:: sqlobject.classregistry
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.col.rst b/docs/api/sqlobject.col.rst
new file mode 100644
index 0000000..5282fc2
--- /dev/null
+++ b/docs/api/sqlobject.col.rst
@@ -0,0 +1,7 @@
+sqlobject.col module
+====================
+
+.. automodule:: sqlobject.col
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.compat.rst b/docs/api/sqlobject.compat.rst
new file mode 100644
index 0000000..cdb4f6d
--- /dev/null
+++ b/docs/api/sqlobject.compat.rst
@@ -0,0 +1,7 @@
+sqlobject.compat module
+=======================
+
+.. automodule:: sqlobject.compat
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.conftest.rst b/docs/api/sqlobject.conftest.rst
new file mode 100644
index 0000000..8e56428
--- /dev/null
+++ b/docs/api/sqlobject.conftest.rst
@@ -0,0 +1,7 @@
+sqlobject.conftest module
+=========================
+
+.. automodule:: sqlobject.conftest
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.constraints.rst b/docs/api/sqlobject.constraints.rst
new file mode 100644
index 0000000..ad39272
--- /dev/null
+++ b/docs/api/sqlobject.constraints.rst
@@ -0,0 +1,7 @@
+sqlobject.constraints module
+============================
+
+.. automodule:: sqlobject.constraints
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.converters.rst b/docs/api/sqlobject.converters.rst
new file mode 100644
index 0000000..82b5cff
--- /dev/null
+++ b/docs/api/sqlobject.converters.rst
@@ -0,0 +1,7 @@
+sqlobject.converters module
+===========================
+
+.. automodule:: sqlobject.converters
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dbconnection.rst b/docs/api/sqlobject.dbconnection.rst
new file mode 100644
index 0000000..6a6adc3
--- /dev/null
+++ b/docs/api/sqlobject.dbconnection.rst
@@ -0,0 +1,7 @@
+sqlobject.dbconnection module
+=============================
+
+.. automodule:: sqlobject.dbconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dberrors.rst b/docs/api/sqlobject.dberrors.rst
new file mode 100644
index 0000000..3035746
--- /dev/null
+++ b/docs/api/sqlobject.dberrors.rst
@@ -0,0 +1,7 @@
+sqlobject.dberrors module
+=========================
+
+.. automodule:: sqlobject.dberrors
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.declarative.rst b/docs/api/sqlobject.declarative.rst
new file mode 100644
index 0000000..9cc7e9b
--- /dev/null
+++ b/docs/api/sqlobject.declarative.rst
@@ -0,0 +1,7 @@
+sqlobject.declarative module
+============================
+
+.. automodule:: sqlobject.declarative
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.events.rst b/docs/api/sqlobject.events.rst
new file mode 100644
index 0000000..8c33239
--- /dev/null
+++ b/docs/api/sqlobject.events.rst
@@ -0,0 +1,7 @@
+sqlobject.events module
+=======================
+
+.. automodule:: sqlobject.events
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.firebirdconnection.rst b/docs/api/sqlobject.firebird.firebirdconnection.rst
new file mode 100644
index 0000000..6fdf26e
--- /dev/null
+++ b/docs/api/sqlobject.firebird.firebirdconnection.rst
@@ -0,0 +1,7 @@
+sqlobject.firebird.firebirdconnection module
+============================================
+
+.. automodule:: sqlobject.firebird.firebirdconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.rst b/docs/api/sqlobject.firebird.rst
new file mode 100644
index 0000000..78cec9a
--- /dev/null
+++ b/docs/api/sqlobject.firebird.rst
@@ -0,0 +1,15 @@
+sqlobject.firebird package
+==========================
+
+.. automodule:: sqlobject.firebird
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.firebird.firebirdconnection
+
diff --git a/docs/api/sqlobject.include.hashcol.rst b/docs/api/sqlobject.include.hashcol.rst
... 2641 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-6-gf4c379f

[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  f4c379f265918c016fe1df63194df38350dc753d (commit)
       via  c0737d14122550cfe965d193d899c8ab0801999d (commit)
      from  e6e23b61934f7ef97a0c3471a8300b8505f2d3c5 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 docs/News.rst |    8 ++++++++
 tox.ini       |    3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-4-ge6e23b6

[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  e6e23b61934f7ef97a0c3471a8300b8505f2d3c5 (commit)
      from  821e03a96a8cc5de413cd05163a7ac452753dad8 (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/e6e23b61934f7ef97a0c3471a8300b8505f2d3c5

commit e6e23b61934f7ef97a0c3471a8300b8505f2d3c5
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Aug 24 23:11:36 2016 +0300

    News.rst: fix grammar (passive voice)
    
    [skip ci]

diff --git a/docs/News.rst b/docs/News.rst
index dc51363..c182b5e 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -33,8 +33,8 @@ Features
 Documentation
 -------------
 
-* Developer's Guide extended to explain SQLObject architecture and how
-  to create a new column type.
+* Developer's Guide is extended to explain SQLObject architecture
+  and how to create a new column type.
 
 * Fix URLs that can be found; remove missing links.
 

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

Summary of changes:
 docs/News.rst |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs updated. 3.1.0-10-g84cf6f7

[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, sphinx-docs has been updated
  discards  ae517fe44dfbc64ebc3ab8238ffc0a78f9af9af3 (commit)
  discards  3784fca6b005faff9cad6f4f93a13f0cb95f5a69 (commit)
  discards  22ed8ab38e82c1ece6ab8fcbdbf6e10b5823fcf7 (commit)
  discards  8e23ea8e05378fda37dd0d8974b6b237a6a8b13f (commit)
  discards  cb1628132124956d0f89a62a0aa1874d780fd175 (commit)
  discards  6587ffc2c5457467fc37cc075d977e9709398c0e (commit)
  discards  4fbe019a25c60ccf840d28171dc92b77c8909fa3 (commit)
       via  84cf6f745235dc32cd40ecfd44bbc40b0dfa60d0 (commit)
       via  4cb4fb286637fdffe2fc3ca919b89839192520aa (commit)
       via  8b7623b5b97d0550dc688c8503dcdc9a0d82f5a9 (commit)
       via  e707192eff744af257a1e12cad5747d854dddc43 (commit)
       via  18424330a20d91ea6c9e469b6328ee716a62e7d3 (commit)
       via  eb0edfc6849d4f4e38b3a37184aadc5c05c2a857 (commit)
       via  eab5dc856b962ad3a5742e12671def3d63a8c216 (commit)
       via  821e03a96a8cc5de413cd05163a7ac452753dad8 (commit)
       via  cb4147b7a1a6fb74e654df4b034f6a619b4f4985 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (ae517fe44dfbc64ebc3ab8238ffc0a78f9af9af3)
            \
             N -- N -- N (84cf6f745235dc32cd40ecfd44bbc40b0dfa60d0)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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/84cf6f745235dc32cd40ecfd44bbc40b0dfa60d0

commit 84cf6f745235dc32cd40ecfd44bbc40b0dfa60d0
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 13 08:06:47 2016 +0300

    Use this year for copyright year in docs
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index c71d051..b0daf42 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,6 +12,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from datetime import date
 import sys
 import os
 
@@ -48,7 +49,7 @@ master_doc = 'index'
 # General information about the project.
 project = u'SQLObject'
 authors = u'Ian Bicking and contributors'
-copyright = u'2004-2016, ' + authors
+copyright = u'2004-%d, %s' % (date.today().year, authors)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

http://sourceforge.net/p/sqlobject/sqlobject/ci/4cb4fb286637fdffe2fc3ca919b89839192520aa

commit 4cb4fb286637fdffe2fc3ca919b89839192520aa
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 13 08:06:47 2016 +0300

    Deduce version/release for docs from __version__
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index 2ab636c..c71d051 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,8 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-# import sys
-# import os
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -54,10 +54,12 @@ copyright = u'2004-2016, ' + authors
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+sys.path.insert(0, os.path.abspath('..'))
+from sqlobject.__version__ import version as __version__
 # The short X.Y version.
-version = '3.1'
+version = '.'.join(__version__.split('.')[:2])
 # The full version, including alpha/beta/rc tags.
-release = '3.1.0b2'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

http://sourceforge.net/p/sqlobject/sqlobject/ci/8b7623b5b97d0550dc688c8503dcdc9a0d82f5a9

commit 8b7623b5b97d0550dc688c8503dcdc9a0d82f5a9
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:42:35 2016 +0300

    Build docs from the current sources
    
    [skip ci]

diff --git a/docs/rebuild b/docs/rebuild
index 26a8a08..1270384 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-make html &&
+PYTHONPATH=.. make html &&
 find . -name \*.tmp -type f -delete &&
 exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .

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

commit e707192eff744af257a1e12cad5747d854dddc43
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:40:29 2016 +0300

    Change index: add toctree and indices
    
    [skip ci]

diff --git a/docs/index.rst b/docs/index.rst
index ff0f463..25c07dd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,23 +13,26 @@ applications.
 Documentation
 =============
 
-* `Download <download.html>`_
-* `Mailing list, bugs, etc. <community.html>`_
-* `Related projects and articles <links.html>`_
-
-* `News and updates <News.html>`_
-* `SQLObject and Python 3 <Python3.html>`_
-* `Main SQLObject documentation <SQLObject.html>`_
-* `Frequently Asked Questions <FAQ.html>`_
-* `sqlbuilder documentation <SQLBuilder.html>`_
-* `select() and SelectResults <SelectResults.html>`_
-* `sqlobject-admin documentation <sqlobject-admin.html>`_
-* `Inheritance <Inheritance.html>`_
-* `Versioning <Versioning.html>`_
-* `Views <Views.html>`_
-* `Developer Guide <DeveloperGuide.html>`_
-* `Contributors <Authors.html>`_
-* `TODO <TODO.html>`_
+.. toctree::
+   :maxdepth: 1
+
+   download
+   community
+   links
+
+   News
+   Python3
+   SQLObject
+   FAQ
+   SQLBuilder
+   SelectResults
+   sqlobject-admin
+   Inheritance
+   Versioning
+   Views
+   DeveloperGuide
+   Authors
+   TODO
 
 Example
 =======
@@ -65,6 +68,15 @@ Here's how you'd use the object::
   >>> p is p2
   True
 
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+
 .. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
    :target: https://sourceforge.net/projects/sqlobject
    :class: noborder

http://sourceforge.net/p/sqlobject/sqlobject/ci/18424330a20d91ea6c9e469b6328ee716a62e7d3

commit 18424330a20d91ea6c9e469b6328ee716a62e7d3
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:39:38 2016 +0300

    Copy _build/html to docs to include into sdist and eggs
    
    [skip ci]

diff --git a/docs/.gitignore b/docs/.gitignore
index bbbd193..113e221 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +1,3 @@
 /_build/
 /data.db
+/html
diff --git a/docs/rebuild b/docs/rebuild
index f041d0d..26a8a08 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -1,4 +1,5 @@
 #! /bin/sh
 
 make html &&
-exec find . -name \*.tmp -type f -delete
+find . -name \*.tmp -type f -delete &&
+exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .
diff --git a/setup.py b/setup.py
index 5e39636..0b0904d 100755
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,32 @@ and `GitHub <https://github.com/sqlobject>`_.
       package_data={"sqlobject":
                     [
                         "../docs/LICENSE", "../docs/*.rst", "../docs/*.css",
+                        "../docs/html/*",
+                        "../docs/html/_sources/*",
+                        "../docs/html/_sources/api/*",
+                        "../docs/html/_modules/*",
+                        "../docs/html/_modules/sqlobject/*",
+                        "../docs/html/_modules/sqlobject/mysql/*",
+                        "../docs/html/_modules/sqlobject/postgres/*",
+                        "../docs/html/_modules/sqlobject/manager/*",
+                        "../docs/html/_modules/sqlobject/inheritance/*",
+                        "../docs/html/_modules/sqlobject/inheritance/tests/*",
+                        "../docs/html/_modules/sqlobject/mssql/*",
+                        "../docs/html/_modules/sqlobject/tests/*",
+                        "../docs/html/_modules/sqlobject/rdbhost/*",
+                        "../docs/html/_modules/sqlobject/versioning/*",
+                        "../docs/html/_modules/sqlobject/versioning/test/*",
+                        "../docs/html/_modules/sqlobject/util/*",
+                        "../docs/html/_modules/sqlobject/maxdb/*",
+                        "../docs/html/_modules/sqlobject/firebird/*",
+                        "../docs/html/_modules/sqlobject/sybase/*",
+                        "../docs/html/_modules/sqlobject/sqlite/*",
+                        "../docs/html/_modules/sqlobject/include/*",
+                        "../docs/html/_modules/sqlobject/include/tests/*",
+                        "../docs/html/_modules/pydispatch/*",
+                        "../docs/html/_modules/_pytest/*",
+                        "../docs/html/api/*",
+                        "../docs/html/_static/*",
                     ],
                     "sqlobject.maxdb": ["readme.txt"],
                     },

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

commit eb0edfc6849d4f4e38b3a37184aadc5c05c2a857
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:37:15 2016 +0300

    Use Sphinx autodoc extension to build modules' docs from docstrings
    
    [skip ci]

diff --git a/MANIFEST.in b/MANIFEST.in
index 7090e7c..f77a140 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include MANIFEST.in ez_setup.py
 include .travis.yml circle.yml tox.ini
 include *.rst *.txt docs/LICENSE docs/*.rst
-include docs/Makefile docs/rebuild
+include docs/Makefile docs/genapidocs docs/rebuild
 include sqlobject/.coveragerc
 include sqlobject/maxdb/readme.txt
 recursive-include debian *
diff --git a/docs/api/modules.rst b/docs/api/modules.rst
new file mode 100644
index 0000000..656ed22
--- /dev/null
+++ b/docs/api/modules.rst
@@ -0,0 +1,7 @@
+sqlobject
+=========
+
+.. toctree::
+   :maxdepth: 4
+
+   sqlobject
diff --git a/docs/api/sqlobject.boundattributes.rst b/docs/api/sqlobject.boundattributes.rst
new file mode 100644
index 0000000..1518f8d
--- /dev/null
+++ b/docs/api/sqlobject.boundattributes.rst
@@ -0,0 +1,7 @@
+sqlobject.boundattributes module
+================================
+
+.. automodule:: sqlobject.boundattributes
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.cache.rst b/docs/api/sqlobject.cache.rst
new file mode 100644
index 0000000..6c74d5b
--- /dev/null
+++ b/docs/api/sqlobject.cache.rst
@@ -0,0 +1,7 @@
+sqlobject.cache module
+======================
+
+.. automodule:: sqlobject.cache
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.classregistry.rst b/docs/api/sqlobject.classregistry.rst
new file mode 100644
index 0000000..0882491
--- /dev/null
+++ b/docs/api/sqlobject.classregistry.rst
@@ -0,0 +1,7 @@
+sqlobject.classregistry module
+==============================
+
+.. automodule:: sqlobject.classregistry
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.col.rst b/docs/api/sqlobject.col.rst
new file mode 100644
index 0000000..5282fc2
--- /dev/null
+++ b/docs/api/sqlobject.col.rst
@@ -0,0 +1,7 @@
+sqlobject.col module
+====================
+
+.. automodule:: sqlobject.col
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.compat.rst b/docs/api/sqlobject.compat.rst
new file mode 100644
index 0000000..cdb4f6d
--- /dev/null
+++ b/docs/api/sqlobject.compat.rst
@@ -0,0 +1,7 @@
+sqlobject.compat module
+=======================
+
+.. automodule:: sqlobject.compat
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.conftest.rst b/docs/api/sqlobject.conftest.rst
new file mode 100644
index 0000000..8e56428
--- /dev/null
+++ b/docs/api/sqlobject.conftest.rst
@@ -0,0 +1,7 @@
+sqlobject.conftest module
+=========================
+
+.. automodule:: sqlobject.conftest
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.constraints.rst b/docs/api/sqlobject.constraints.rst
new file mode 100644
index 0000000..ad39272
--- /dev/null
+++ b/docs/api/sqlobject.constraints.rst
@@ -0,0 +1,7 @@
+sqlobject.constraints module
+============================
+
+.. automodule:: sqlobject.constraints
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.converters.rst b/docs/api/sqlobject.converters.rst
new file mode 100644
index 0000000..82b5cff
--- /dev/null
+++ b/docs/api/sqlobject.converters.rst
@@ -0,0 +1,7 @@
+sqlobject.converters module
+===========================
+
+.. automodule:: sqlobject.converters
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dbconnection.rst b/docs/api/sqlobject.dbconnection.rst
new file mode 100644
index 0000000..6a6adc3
--- /dev/null
+++ b/docs/api/sqlobject.dbconnection.rst
@@ -0,0 +1,7 @@
+sqlobject.dbconnection module
+=============================
+
+.. automodule:: sqlobject.dbconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dberrors.rst b/docs/api/sqlobject.dberrors.rst
new file mode 100644
index 0000000..3035746
--- /dev/null
+++ b/docs/api/sqlobject.dberrors.rst
@@ -0,0 +1,7 @@
+sqlobject.dberrors module
+=========================
+
+.. automodule:: sqlobject.dberrors
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.declarative.rst b/docs/api/sqlobject.declarative.rst
new file mode 100644
index 0000000..9cc7e9b
--- /dev/null
+++ b/docs/api/sqlobject.declarative.rst
@@ -0,0 +1,7 @@
+sqlobject.declarative module
+============================
+
+.. automodule:: sqlobject.declarative
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.events.rst b/docs/api/sqlobject.events.rst
new file mode 100644
index 0000000..8c33239
--- /dev/null
+++ b/docs/api/sqlobject.events.rst
@@ -0,0 +1,7 @@
+sqlobject.events module
+=======================
+
+.. automodule:: sqlobject.events
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.firebirdconnection.rst b/docs/api/sqlobject.firebird.firebirdconnection.rst
new file mode 100644
index 0000000..6fdf26e
--- /dev/null
+++ b/docs/api/sqlobject.firebird.firebirdconnection.rst
@@ -0,0 +1,7 @@
+sqlobject.firebird.firebirdconnection module
+============================================
+
+.. automodule:: sqlobject.firebird.firebirdconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.rst b/docs/api/sqlobject.firebird.rst
new file mode 100644
index 0000000..78cec9a
--- /dev/null
+++ b/docs/api/sqlobject.firebird.rst
@@ -0,0 +1,15 @@
+sqlobject.firebird package
+==========================
+
+.. automodule:: sqlobject.firebird
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.firebird.firebirdconnection
+
diff --git a/docs/api/sqlobject.include.hashcol.rst b/docs/api/sqlobject.include.hashcol.rst
new file mode 100644
... 2640 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-3-g821e03a

[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  821e03a96a8cc5de413cd05163a7ac452753dad8 (commit)
       via  cb4147b7a1a6fb74e654df4b034f6a619b4f4985 (commit)
      from  d96d5815417116e2efa1be5d57cbe0707f16770e (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 MANIFEST.in |    1 -
 README.rst  |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository annotated tag 3.1.0b2 created. 3.1.0b2

[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 annotated tag, 3.1.0b2 has been created
        at  2dd3e49698a85165fb88ca745ccad028a814a8ba (tag)
   tagging  0301abee2c622b0718d2181361bc9719d557af6c (commit)
  replaces  3.1.0b1
 tagged by  Oleg Broytman
        on  Wed Aug 10 18:03:35 2016 +0300

- Log -----------------------------------------------------------------
Release 3.1.0b2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABCgAGBQJXq0JHAAoJEG4IC3C2KHsDQxIQAKkkY7HEtyp4pZaqmzFzNx8V
o6RRJuSCJy+wvu2JYpg5SumGastuZ7S7OwTCKulhH3THBF0kZodJfsWFmj27MrE1
cQw1OWnHL1ervl7gIV5cVJUUx4uMcaudqhLzlLOQsYo5eRQCf5CELuTGF9Js+PUS
AUXBWEI6QBsPjstdJ2GjyANqVOGAfz6iSZsv5C0A4tsl9IkUyXgPhAOYGzA36xN3
jrT+q4APB2ngwU9BlFjD/Ne9XmjPqTA8mZQB5fVbdslQfM77E8mEE0le4yqiuSC0
6/1Ipn1+Y2S+V73fBmc4ORoeCwB/m3Xf0Uhn6ogTmAKiMU52vFGENVpYN6ByYDt4
LcF1y0VLz5hq+QL4rl2je9/9n3yqnxnnRyWbT4iVwkn/093XTHJ5dTj5/g+xAYTj
vEhFHRVck7W6fci3osml2pAAzeCKb9xU8iKFPyu/jzPf6dcA8O5C9avc4UzY4K/a
SJxQrYhpH8X2FV21nfVbAMkE3+ijoxkAshjXU7blv2D8Owd42Wfhg5SW/6APQRis
CUkdnQClHaI1H0Ficke22biFR6lDAb7u4iXLDVQeRiR4IdVCg3YaprswEGS6+w5g
bv6QTV/SSEBZmobwvIodGVQhF00Sad9RspNsiJlytBR6XNFiCo859bePADUlWPLd
8ZP1+/rIIc5oGwrNlGk6
=6CBF
-----END PGP SIGNATURE-----

Oleg Broytman (28):
      Use pytest-cov for test coverage
      Report test coverage via coveralls.io
      Report test coverage via codecov.io
      [skip ci] or [ci skip]
      DevGuide update: we use coverage.py, Coveralls and Codecov
      Add requirements.txt
      Fix pip command line
      Add requirements for development and docs building
      Require tox >= 1.8
      Python 2.6, 2.7 and 3.4 require different minimal versions of FormEncode
      Group postgres test environments
      Run on Circle CI
      Different versions of FormEncode in install_requires
      Add 'requires' setup keyword
      Refactoring tox.ini
      Simplify flake8 tox.ini commands
      Enable pip cache on Travis
      Rename pip-wrapper -> pip-install
      Fix bashism: ~ => $HOME
      Simplify tox.ini fake8 env even further
      For Python >= 3.4 minimal FormEncode version is now 1.3.1
      Embed Coveralls badge in Developer Guide
      We also use Circle CI
      Rename reStructuredText file from *.txt to *.rst
      Install mxDateTime to run date/time tests with it
      Convert timedelta to mxDateTime.Time
      .coveragerc: omit modules and tests that aren't usually run
      Release 3.1.0b2

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


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository annotated tag 3.1.0b1 created. 3.1.0b1

[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 annotated tag, 3.1.0b1 has been created
        at  77a84c65000b3611d1b75cf2d0d3af3440fd401c (tag)
   tagging  e860578692889bdb61af6734fd7e156026379588 (commit)
  replaces  3.0.0
 tagged by  Oleg Broytman
        on  Sun Jul 31 20:56:10 2016 +0300

- Log -----------------------------------------------------------------
Release 3.1.0b1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABCgAGBQJXnju6AAoJEG4IC3C2KHsDdAoQAIvSs63kemEZF3jTmuvFtebB
p40BMGg2F9I1cdq9F+G11MjN51hMiPcURaNRGT/DvMnG5MGOA1s2l9ZPKDxrH2dP
RqvFPUktMbkz21qDfPzykJMkPDhI2kqUgtqdTILwmTPhdoKwe6xIcmd+cbs57HAD
TQAKOBDBexOfhXz5b+mXxbpPgAKS14lYkQJBORW3I8M7EB+0KWbIUTLpU1TCLU4n
ewOk9pPSQxGuFNkMBnwZNKvFrcFtp+ksqou1eUWWobSICa+rOiz85/mDzF9cEols
XQh5+uNihn82OhIjU35pNWtD2ELiuCskBhNqh9dscu/ooPV71rXTqf2qRG+DeyBD
KuFdzZXUqNNdFeygQvg96piNOX+Z8ww0k/7hW80T4GRe3m3T85Fj3gl3k2fNQJst
5ao8lch3qAfty1YVsa5MAhV/gH/isutqP80SFNIH/ZiW5sIp8Rh3FFJMqA2Tb2hD
XKuOcFa6iYRQBW4MO91fTw4Sb9fy1N4V1eXTyUrOVuWjx11G893OR9D/9u1fGm2M
L8XdBHZgEOFgz5qernOP/Dgeq5x7IsabHxJgIMv0VKCkGNp4A+QgTTwTgLpbK/lV
2XX1FBJ615DfPzSP2Lb+dcjSrnw06zTgJuunb7JjoYrOFFZTXz79DkVD7sGek+Bp
nEML3/NfZp8wLQhWb3KS
=k3MG
-----END PGP SIGNATURE-----

Lutz Steinborn (3):
      UuidCol and test added
      added VARCHAR(36) for DBs with out uuid type
      JsonbCol and doc added

Oleg Broytman (30):
      Gonna extend the dev guide
      Change clone URL from SF to github
      Explain why a dev should fork and clone
      SQLObject architecture from the developer's point of view
      Use the latest kid (0.9.6)
      Use https for pypi.python.org
      We, the developers...
      Link to html'ized sources
      Explain columns, validators and converters in details
      Merge pull request #118 from LutzSteinborn/master
      Lutz Steinborn added UuidCol
      Developer's Guide was extended
      The next release will be 3.1.0
      Fix flake8 warnings
      Small enhancements in UuidCol
      Document UuidCol
      Ignore flake8's F405
      Document [ci skip]
      Fix docs for JsonbCol
      Move the new columns to the end of the module
      Fix test_jsonbcol.py
      Fix all `import *`
      Explain why we still ignore E401 flake8's error
      Fix URLs
      Add missing sflogo to Python3.txt
      Add JSONCol
      Minor docs update: TODO
      Upgrade ez_setup.py
      Split News.txt into News5.txt
      Release 3.1.0b1

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


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository annotated tag 3.1.0 created. 3.1.0

[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 annotated tag, 3.1.0 has been created
        at  82289efb15bb53be50b2c6aeff0f8f19c08ac820 (tag)
   tagging  2b89804ea6e81cc4d159e2d46e811a6b67b2960c (commit)
  replaces  3.1.0b3
 tagged by  Oleg Broytman
        on  Tue Aug 16 21:40:25 2016 +0300

- Log -----------------------------------------------------------------
Release 3.1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABCgAGBQJXs14ZAAoJEG4IC3C2KHsDgg8QAKfjyQ8Jyg7Ym+3vFBWlyqip
Jk4/D/H/rsDc4oN28LOJfK8tgFn4lpArGR6JsnCeElv6hWffEaRdmuIpqFneaSPa
1XGliUqtd92UgTjeem2qqD33/8FJWBTCXwCk/SApxO2gmGqyho0hHsni1OOznZ05
FRYeOXSgoW8OXIFvix4Yv0CEeRRY8eMIwNrcEQXU9MK00Zfm00fs/fLT1hazu4It
YDvsqtXC/gqeUoBcu+vGILzF+0j2bgCUgYC9EphcABLY7P8Vmqdu/9v+BaLoVXxL
U+TTJuQINnfhBwxeuFveR7OEKqnbkToUuQ5l3PnZQjkTXbT/3P3dATI5fBlglXgz
VFSUr8/HhcthKC5EhbZKizG3t/80/PzwRvGc6NbHHG3NABTdXtwICV+zZYNv1JvH
gcoWi00umA7MhNWmjKQB8rkDvCq7iZiSPhMmZdgDqyHDjFJI0sHbsDm7BNqk5X9O
rHtEbCcZ4+FXF20qCiAwEQrzCE9SUKGu0cOMQ/JBmkSZ6HzycgnhPHSWcPWGTZFu
V83Pd+IVHsy89MPMIQFPohpaDo09Kvyh2ZyxBA98QtLLpeIuROsLnKBYA37mOStM
SEKxxq4R+376PQB09GiG77UFPfjX2xndyg5zFp1KhZ65fuZhuFI/OGK8MalAP5ST
UkbN4DOMQeomZfFPUMQJ
=IzhR
-----END PGP SIGNATURE-----

Oleg Broytman (1):
      Release 3.1.0

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


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs updated. 3.0.0-91-gae517fe

[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, sphinx-docs has been updated
  discards  a14c1e0f649e1f5ec9cfd977fe61777d3136dc26 (commit)
  discards  356c46d2c88a21a72944d9197065433d87c5239b (commit)
  discards  d16a6f0b0803dd7e518245f107113520bf542566 (commit)
  discards  2dea02fc6739c56a4484e0df7add133df66ad300 (commit)
  discards  5817e50a2343bde3154841abcf14358127759805 (commit)
  discards  555771a57c2a36b452bee160d765c09b28b3c88f (commit)
       via  ae517fe44dfbc64ebc3ab8238ffc0a78f9af9af3 (commit)
       via  3784fca6b005faff9cad6f4f93a13f0cb95f5a69 (commit)
       via  22ed8ab38e82c1ece6ab8fcbdbf6e10b5823fcf7 (commit)
       via  8e23ea8e05378fda37dd0d8974b6b237a6a8b13f (commit)
       via  cb1628132124956d0f89a62a0aa1874d780fd175 (commit)
       via  6587ffc2c5457467fc37cc075d977e9709398c0e (commit)
       via  4fbe019a25c60ccf840d28171dc92b77c8909fa3 (commit)
       via  d96d5815417116e2efa1be5d57cbe0707f16770e (commit)
       via  2b89804ea6e81cc4d159e2d46e811a6b67b2960c (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (a14c1e0f649e1f5ec9cfd977fe61777d3136dc26)
            \
             N -- N -- N (ae517fe44dfbc64ebc3ab8238ffc0a78f9af9af3)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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/ae517fe44dfbc64ebc3ab8238ffc0a78f9af9af3

commit ae517fe44dfbc64ebc3ab8238ffc0a78f9af9af3
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 13 08:06:47 2016 +0300

    Use this year for copyright year in docs
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index c71d051..b0daf42 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,6 +12,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from datetime import date
 import sys
 import os
 
@@ -48,7 +49,7 @@ master_doc = 'index'
 # General information about the project.
 project = u'SQLObject'
 authors = u'Ian Bicking and contributors'
-copyright = u'2004-2016, ' + authors
+copyright = u'2004-%d, %s' % (date.today().year, authors)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

http://sourceforge.net/p/sqlobject/sqlobject/ci/3784fca6b005faff9cad6f4f93a13f0cb95f5a69

commit 3784fca6b005faff9cad6f4f93a13f0cb95f5a69
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 13 08:06:47 2016 +0300

    Deduce version/release for docs from __version__
    
    [skip ci]

diff --git a/docs/conf.py b/docs/conf.py
index 2ab636c..c71d051 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,8 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-# import sys
-# import os
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -54,10 +54,12 @@ copyright = u'2004-2016, ' + authors
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+sys.path.insert(0, os.path.abspath('..'))
+from sqlobject.__version__ import version as __version__
 # The short X.Y version.
-version = '3.1'
+version = '.'.join(__version__.split('.')[:2])
 # The full version, including alpha/beta/rc tags.
-release = '3.1.0b2'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

http://sourceforge.net/p/sqlobject/sqlobject/ci/22ed8ab38e82c1ece6ab8fcbdbf6e10b5823fcf7

commit 22ed8ab38e82c1ece6ab8fcbdbf6e10b5823fcf7
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:42:35 2016 +0300

    Build docs from the current sources
    
    [skip ci]

diff --git a/docs/rebuild b/docs/rebuild
index 26a8a08..1270384 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-make html &&
+PYTHONPATH=.. make html &&
 find . -name \*.tmp -type f -delete &&
 exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .

http://sourceforge.net/p/sqlobject/sqlobject/ci/8e23ea8e05378fda37dd0d8974b6b237a6a8b13f

commit 8e23ea8e05378fda37dd0d8974b6b237a6a8b13f
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:40:29 2016 +0300

    Change index: add toctree and indices
    
    [skip ci]

diff --git a/docs/index.rst b/docs/index.rst
index ff0f463..25c07dd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,23 +13,26 @@ applications.
 Documentation
 =============
 
-* `Download <download.html>`_
-* `Mailing list, bugs, etc. <community.html>`_
-* `Related projects and articles <links.html>`_
-
-* `News and updates <News.html>`_
-* `SQLObject and Python 3 <Python3.html>`_
-* `Main SQLObject documentation <SQLObject.html>`_
-* `Frequently Asked Questions <FAQ.html>`_
-* `sqlbuilder documentation <SQLBuilder.html>`_
-* `select() and SelectResults <SelectResults.html>`_
-* `sqlobject-admin documentation <sqlobject-admin.html>`_
-* `Inheritance <Inheritance.html>`_
-* `Versioning <Versioning.html>`_
-* `Views <Views.html>`_
-* `Developer Guide <DeveloperGuide.html>`_
-* `Contributors <Authors.html>`_
-* `TODO <TODO.html>`_
+.. toctree::
+   :maxdepth: 1
+
+   download
+   community
+   links
+
+   News
+   Python3
+   SQLObject
+   FAQ
+   SQLBuilder
+   SelectResults
+   sqlobject-admin
+   Inheritance
+   Versioning
+   Views
+   DeveloperGuide
+   Authors
+   TODO
 
 Example
 =======
@@ -65,6 +68,15 @@ Here's how you'd use the object::
   >>> p is p2
   True
 
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+
 .. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
    :target: https://sourceforge.net/projects/sqlobject
    :class: noborder

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

commit cb1628132124956d0f89a62a0aa1874d780fd175
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:39:38 2016 +0300

    Copy _build/html to docs to include into sdist and eggs
    
    [skip ci]

diff --git a/docs/.gitignore b/docs/.gitignore
index bbbd193..113e221 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +1,3 @@
 /_build/
 /data.db
+/html
diff --git a/docs/rebuild b/docs/rebuild
index f041d0d..26a8a08 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -1,4 +1,5 @@
 #! /bin/sh
 
 make html &&
-exec find . -name \*.tmp -type f -delete
+find . -name \*.tmp -type f -delete &&
+exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .
diff --git a/setup.py b/setup.py
index 5e39636..0b0904d 100755
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,32 @@ and `GitHub <https://github.com/sqlobject>`_.
       package_data={"sqlobject":
                     [
                         "../docs/LICENSE", "../docs/*.rst", "../docs/*.css",
+                        "../docs/html/*",
+                        "../docs/html/_sources/*",
+                        "../docs/html/_sources/api/*",
+                        "../docs/html/_modules/*",
+                        "../docs/html/_modules/sqlobject/*",
+                        "../docs/html/_modules/sqlobject/mysql/*",
+                        "../docs/html/_modules/sqlobject/postgres/*",
+                        "../docs/html/_modules/sqlobject/manager/*",
+                        "../docs/html/_modules/sqlobject/inheritance/*",
+                        "../docs/html/_modules/sqlobject/inheritance/tests/*",
+                        "../docs/html/_modules/sqlobject/mssql/*",
+                        "../docs/html/_modules/sqlobject/tests/*",
+                        "../docs/html/_modules/sqlobject/rdbhost/*",
+                        "../docs/html/_modules/sqlobject/versioning/*",
+                        "../docs/html/_modules/sqlobject/versioning/test/*",
+                        "../docs/html/_modules/sqlobject/util/*",
+                        "../docs/html/_modules/sqlobject/maxdb/*",
+                        "../docs/html/_modules/sqlobject/firebird/*",
+                        "../docs/html/_modules/sqlobject/sybase/*",
+                        "../docs/html/_modules/sqlobject/sqlite/*",
+                        "../docs/html/_modules/sqlobject/include/*",
+                        "../docs/html/_modules/sqlobject/include/tests/*",
+                        "../docs/html/_modules/pydispatch/*",
+                        "../docs/html/_modules/_pytest/*",
+                        "../docs/html/api/*",
+                        "../docs/html/_static/*",
                     ],
                     "sqlobject.maxdb": ["readme.txt"],
                     },

http://sourceforge.net/p/sqlobject/sqlobject/ci/6587ffc2c5457467fc37cc075d977e9709398c0e

commit 6587ffc2c5457467fc37cc075d977e9709398c0e
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 23:37:15 2016 +0300

    Use Sphinx autodoc extension to build modules' docs from docstrings
    
    [skip ci]

diff --git a/MANIFEST.in b/MANIFEST.in
index c100558..b2facfc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,7 @@ global-include .gitignore
 include MANIFEST.in ez_setup.py
 include .travis.yml circle.yml tox.ini
 include *.rst *.txt docs/LICENSE docs/*.rst
-include docs/Makefile docs/rebuild
+include docs/Makefile docs/genapidocs docs/rebuild
 include sqlobject/.coveragerc
 include sqlobject/maxdb/readme.txt
 recursive-include debian *
diff --git a/docs/api/modules.rst b/docs/api/modules.rst
new file mode 100644
index 0000000..656ed22
--- /dev/null
+++ b/docs/api/modules.rst
@@ -0,0 +1,7 @@
+sqlobject
+=========
+
+.. toctree::
+   :maxdepth: 4
+
+   sqlobject
diff --git a/docs/api/sqlobject.boundattributes.rst b/docs/api/sqlobject.boundattributes.rst
new file mode 100644
index 0000000..1518f8d
--- /dev/null
+++ b/docs/api/sqlobject.boundattributes.rst
@@ -0,0 +1,7 @@
+sqlobject.boundattributes module
+================================
+
+.. automodule:: sqlobject.boundattributes
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.cache.rst b/docs/api/sqlobject.cache.rst
new file mode 100644
index 0000000..6c74d5b
--- /dev/null
+++ b/docs/api/sqlobject.cache.rst
@@ -0,0 +1,7 @@
+sqlobject.cache module
+======================
+
+.. automodule:: sqlobject.cache
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.classregistry.rst b/docs/api/sqlobject.classregistry.rst
new file mode 100644
index 0000000..0882491
--- /dev/null
+++ b/docs/api/sqlobject.classregistry.rst
@@ -0,0 +1,7 @@
+sqlobject.classregistry module
+==============================
+
+.. automodule:: sqlobject.classregistry
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.col.rst b/docs/api/sqlobject.col.rst
new file mode 100644
index 0000000..5282fc2
--- /dev/null
+++ b/docs/api/sqlobject.col.rst
@@ -0,0 +1,7 @@
+sqlobject.col module
+====================
+
+.. automodule:: sqlobject.col
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.compat.rst b/docs/api/sqlobject.compat.rst
new file mode 100644
index 0000000..cdb4f6d
--- /dev/null
+++ b/docs/api/sqlobject.compat.rst
@@ -0,0 +1,7 @@
+sqlobject.compat module
+=======================
+
+.. automodule:: sqlobject.compat
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.conftest.rst b/docs/api/sqlobject.conftest.rst
new file mode 100644
index 0000000..8e56428
--- /dev/null
+++ b/docs/api/sqlobject.conftest.rst
@@ -0,0 +1,7 @@
+sqlobject.conftest module
+=========================
+
+.. automodule:: sqlobject.conftest
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.constraints.rst b/docs/api/sqlobject.constraints.rst
new file mode 100644
index 0000000..ad39272
--- /dev/null
+++ b/docs/api/sqlobject.constraints.rst
@@ -0,0 +1,7 @@
+sqlobject.constraints module
+============================
+
+.. automodule:: sqlobject.constraints
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.converters.rst b/docs/api/sqlobject.converters.rst
new file mode 100644
index 0000000..82b5cff
--- /dev/null
+++ b/docs/api/sqlobject.converters.rst
@@ -0,0 +1,7 @@
+sqlobject.converters module
+===========================
+
+.. automodule:: sqlobject.converters
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dbconnection.rst b/docs/api/sqlobject.dbconnection.rst
new file mode 100644
index 0000000..6a6adc3
--- /dev/null
+++ b/docs/api/sqlobject.dbconnection.rst
@@ -0,0 +1,7 @@
+sqlobject.dbconnection module
+=============================
+
+.. automodule:: sqlobject.dbconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dberrors.rst b/docs/api/sqlobject.dberrors.rst
new file mode 100644
index 0000000..3035746
--- /dev/null
+++ b/docs/api/sqlobject.dberrors.rst
@@ -0,0 +1,7 @@
+sqlobject.dberrors module
+=========================
+
+.. automodule:: sqlobject.dberrors
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.declarative.rst b/docs/api/sqlobject.declarative.rst
new file mode 100644
index 0000000..9cc7e9b
--- /dev/null
+++ b/docs/api/sqlobject.declarative.rst
@@ -0,0 +1,7 @@
+sqlobject.declarative module
+============================
+
+.. automodule:: sqlobject.declarative
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.events.rst b/docs/api/sqlobject.events.rst
new file mode 100644
index 0000000..8c33239
--- /dev/null
+++ b/docs/api/sqlobject.events.rst
@@ -0,0 +1,7 @@
+sqlobject.events module
+=======================
+
+.. automodule:: sqlobject.events
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.firebirdconnection.rst b/docs/api/sqlobject.firebird.firebirdconnection.rst
new file mode 100644
index 0000000..6fdf26e
--- /dev/null
+++ b/docs/api/sqlobject.firebird.firebirdconnection.rst
@@ -0,0 +1,7 @@
+sqlobject.firebird.firebirdconnection module
+============================================
+
+.. automodule:: sqlobject.firebird.firebirdconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.rst b/docs/api/sqlobject.firebird.rst
new file mode 100644
index 0000000..78cec9a
--- /dev/null
+++ b/docs/api/sqlobject.firebird.rst
@@ -0,0 +1,15 @@
+sqlobject.firebird package
+==========================
+
+.. automodule:: sqlobject.firebird
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.firebird.firebirdconnection
+
diff --git a/docs/api/sqlobject.include.hashcol.rst b/docs/api/sqlobject.include.hashcol.rst
new file mode 100644
index 0000000..76396aa
... 2643 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository