sqlobject-cvs Mailing List for SQLObject (Page 10)

SQLObject is a Python ORM.

Brought to you by: ianbicking, phd

sqlobject-cvs — CVS notification

You can subscribe to this list here.

2003	Jan	Feb	Mar (9)	Apr (74)	May (29)	Jun (16)	Jul (28)	Aug (10)	Sep (57)	Oct (9)	Nov (29)	Dec (12)
2004	Jan (7)	Feb (14)	Mar (6)	Apr (3)	May (12)	Jun (34)	Jul (9)	Aug (29)	Sep (22)	Oct (2)	Nov (15)	Dec (52)
2005	Jan (47)	Feb (78)	Mar (14)	Apr (35)	May (33)	Jun (16)	Jul (26)	Aug (63)	Sep (40)	Oct (96)	Nov (96)	Dec (123)
2006	Jan (159)	Feb (144)	Mar (64)	Apr (31)	May (88)	Jun (48)	Jul (16)	Aug (64)	Sep (87)	Oct (92)	Nov (56)	Dec (76)
2007	Jan (94)	Feb (103)	Mar (126)	Apr (123)	May (85)	Jun (11)	Jul (130)	Aug (47)	Sep (65)	Oct (70)	Nov (12)	Dec (11)
2008	Jan (30)	Feb (55)	Mar (88)	Apr (20)	May (50)	Jun	Jul (38)	Aug (1)	Sep (9)	Oct (5)	Nov (6)	Dec (39)
2009	Jan (8)	Feb (16)	Mar (3)	Apr (33)	May (44)	Jun (1)	Jul (10)	Aug (33)	Sep (74)	Oct (22)	Nov	Dec (15)
2010	Jan (28)	Feb (22)	Mar (46)	Apr (29)	May (1)	Jun (1)	Jul (27)	Aug (8)	Sep (5)	Oct (33)	Nov (24)	Dec (41)
2011	Jan (4)	Feb (12)	Mar (35)	Apr (29)	May (19)	Jun (16)	Jul (32)	Aug (25)	Sep (5)	Oct (11)	Nov (21)	Dec (12)
2012	Jan (3)	Feb (4)	Mar (20)	Apr (4)	May (25)	Jun (13)	Jul	Aug	Sep (2)	Oct (25)	Nov (9)	Dec (1)
2013	Jan (6)	Feb (8)	Mar	Apr (10)	May (31)	Jun (7)	Jul (18)	Aug (33)	Sep (4)	Oct (16)	Nov	Dec (27)
2014	Jan (2)	Feb	Mar	Apr (11)	May (39)	Jun (8)	Jul (11)	Aug (4)	Sep	Oct (27)	Nov	Dec (71)
2015	Jan (17)	Feb (47)	Mar (33)	Apr	May	Jun (9)	Jul (7)	Aug	Sep	Oct	Nov	Dec (8)
2016	Jan (4)	Feb (4)	Mar	Apr	May (12)	Jun (7)	Jul (9)	Aug (31)	Sep (8)	Oct (3)	Nov (15)	Dec (1)
2017	Jan (13)	Feb (7)	Mar (14)	Apr (8)	May (10)	Jun (4)	Jul (2)	Aug (1)	Sep	Oct (8)	Nov (4)	Dec (5)
2018	Jan (2)	Feb (8)	Mar	Apr (4)	May	Jun (6)	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec
2019	Jan (1)	Feb (16)	Mar (1)	Apr (3)	May (5)	Jun (1)	Jul	Aug	Sep (2)	Oct	Nov (1)	Dec (3)
2020	Jan	Feb	Mar	Apr (1)	May (1)	Jun	Jul	Aug (1)	Sep	Oct (2)	Nov	Dec (2)
2021	Jan	Feb (2)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov (1)	Dec
2022	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (6)	Oct (1)	Nov (1)	Dec (4)
2023	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (3)	Sep (2)	Oct (2)	Nov (4)	Dec
2024	Jan	Feb (2)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov	Dec (9)
2025	Jan	Feb (4)	Mar (2)	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 8 9 10 11 12 .. 192 > >> (Page 10 of 192)

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-84-gd96d581

From: Oleg B. <no...@so...> - 2016-08-16 19:00:38

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  d96d5815417116e2efa1be5d57cbe0707f16770e (commit)
       via  2b89804ea6e81cc4d159e2d46e811a6b67b2960c (commit)
      from  05f63d6605d55f5a4d41153e8dfae4e0aadc5d0d (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:
 README.rst               |    2 +-
 docs/News.rst            |    5 +++++
 setup.cfg                |    4 ++--
 setup.py                 |    5 +++--
 sqlobject/__version__.py |    8 ++++----
 5 files changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs updated. 3.0.0-88-ga14c1e0

From: Oleg B. <no...@so...> - 2016-08-13 06:10:24

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  87d7a5ce84f0beb6e2c12ee0bf1a935f9dd8dc19 (commit)
  discards  b41ecb020ec3877c452994ecf770550128253aa7 (commit)
       via  a14c1e0f649e1f5ec9cfd977fe61777d3136dc26 (commit)
       via  356c46d2c88a21a72944d9197065433d87c5239b (commit)
       via  d16a6f0b0803dd7e518245f107113520bf542566 (commit)
       via  2dea02fc6739c56a4484e0df7add133df66ad300 (commit)
       via  5817e50a2343bde3154841abcf14358127759805 (commit)
       via  555771a57c2a36b452bee160d765c09b28b3c88f (commit)
       via  05f63d6605d55f5a4d41153e8dfae4e0aadc5d0d (commit)
       via  cb8f1d37753945c7091cb4a61bc750894be1ac6d (commit)
       via  1f8804784baaf03d057c573183abe94dbb877c27 (commit)
       via  49e6fd5c0d9723f4f543501f435c32e1561b4feb (commit)
       via  80582dc5b2498553996203bd9f43d2e9e9c35e5e (commit)
       via  36240121e42bd163acea0811643dc54d2eff2363 (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 (87d7a5ce84f0beb6e2c12ee0bf1a935f9dd8dc19)
            \
             N -- N -- N (a14c1e0f649e1f5ec9cfd977fe61777d3136dc26)

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

commit a14c1e0f649e1f5ec9cfd977fe61777d3136dc26
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/356c46d2c88a21a72944d9197065433d87c5239b

commit 356c46d2c88a21a72944d9197065433d87c5239b
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/d16a6f0b0803dd7e518245f107113520bf542566

commit d16a6f0b0803dd7e518245f107113520bf542566
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/2dea02fc6739c56a4484e0df7add133df66ad300

commit 2dea02fc6739c56a4484e0df7add133df66ad300
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 8699186..a0235fd 100755
--- a/setup.py
+++ b/setup.py
@@ -98,6 +98,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/5817e50a2343bde3154841abcf14358127759805

commit 5817e50a2343bde3154841abcf14358127759805
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
--- /dev/null
+++ b/docs/api/sqlobject.include.hashcol.rst
@@ -0,0 +1,7 @@
+sqlobject.include.hashcol module
+================================
+
+.. automodule:: sqlobject.include.hashcol
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.include.rst b/docs/api/sqlobject.include.rst
new file mode 100644
index 0000000..62086bf
--- /dev/null
+++ b/docs/api/sqlobject.include.rst
@@ -0,0 +1,22 @@
+sqlobject.include package
+=========================
+
+.. automodule:: sqlobject.include
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+    sqlobject.include.tests
+
+Submodules
+----------
... 2620 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-82-g05f63d6

From: Oleg B. <no...@so...> - 2016-08-13 06:10:22

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  05f63d6605d55f5a4d41153e8dfae4e0aadc5d0d (commit)
       via  cb8f1d37753945c7091cb4a61bc750894be1ac6d (commit)
       via  1f8804784baaf03d057c573183abe94dbb877c27 (commit)
       via  49e6fd5c0d9723f4f543501f435c32e1561b4feb (commit)
       via  80582dc5b2498553996203bd9f43d2e9e9c35e5e (commit)
       via  36240121e42bd163acea0811643dc54d2eff2363 (commit)
      from  6cb059288bcbfcf64d11eda5379b1e210e47f150 (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                      |   12 +++++++-----
 README.rst                       |    2 +-
 docs/News.rst                    |    2 +-
 docs/SQLObject.rst               |    2 --
 setup.py                         |    2 +-
 sqlobject/__version__.py         |    4 ++--
 sqlobject/sqlbuilder.py          |    8 ++++----
 sqlobject/tests/dbtest.py        |    4 +++-
 sqlobject/tests/test_datetime.py |   16 +++++++++++-----
 sqlobject/tests/test_decimal.py  |   11 ++++++++---
 sqlobject/wsgi_middleware.py     |   10 +++++++---
 11 files changed, 45 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs updated. 3.0.0-78-g87d7a5c

From: Oleg B. <no...@so...> - 2016-08-12 04:44:11

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  407f6b93b1fd90d570aa7e6cbb49af291b368da3 (commit)
       via  87d7a5ce84f0beb6e2c12ee0bf1a935f9dd8dc19 (commit)
       via  b41ecb020ec3877c452994ecf770550128253aa7 (commit)
       via  6cb059288bcbfcf64d11eda5379b1e210e47f150 (commit)
       via  f641a45c7eca7644730f15336c76cd950fb874af (commit)
       via  bbf0c5a08c648cf05c0c4fbe1fdb664760226ba3 (commit)
       via  a65f48fcb30a51238949970e339e6d4965d53627 (commit)
       via  de699fdcacdc23975b6adba4bc21e9cf7e9fbece (commit)
       via  ab712792175ee8d7d73ba4dad815da7c469856f0 (commit)
       via  de6860839138cf4a073b1f55568fb3a5e6902e29 (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 (407f6b93b1fd90d570aa7e6cbb49af291b368da3)
            \
             N -- N -- N (87d7a5ce84f0beb6e2c12ee0bf1a935f9dd8dc19)

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/87d7a5ce84f0beb6e2c12ee0bf1a935f9dd8dc19

commit 87d7a5ce84f0beb6e2c12ee0bf1a935f9dd8dc19
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Aug 12 06:39:57 2016 +0300

    Add docs toctree and links to autogenerated indices and search
    
    [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/b41ecb020ec3877c452994ecf770550128253aa7

commit b41ecb020ec3877c452994ecf770550128253aa7
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Feb 16 21:56:33 2015 +0300

    Generate docs using sphinx
    
    Use sphinx-apidoc to generate split API docs.

diff --git a/docs/.gitignore b/docs/.gitignore
index cf1f956..bbbd193 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,4 +1,2 @@
-/*.html
 /_build/
 /data.db
-/html
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..5188142
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,183 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SQLObject.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SQLObject.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
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 @@
... 2313 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-76-g6cb0592

From: Oleg B. <no...@so...> - 2016-08-12 04:44:09

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  6cb059288bcbfcf64d11eda5379b1e210e47f150 (commit)
       via  f641a45c7eca7644730f15336c76cd950fb874af (commit)
       via  bbf0c5a08c648cf05c0c4fbe1fdb664760226ba3 (commit)
       via  a65f48fcb30a51238949970e339e6d4965d53627 (commit)
       via  de699fdcacdc23975b6adba4bc21e9cf7e9fbece (commit)
       via  ab712792175ee8d7d73ba4dad815da7c469856f0 (commit)
       via  de6860839138cf4a073b1f55568fb3a5e6902e29 (commit)
      from  d2a3988f42e27a45702d5a3657d2d6ad0bf449d0 (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/.gitignore         |    1 +
 docs/DeveloperGuide.rst |    9 ++++-----
 docs/Inheritance.rst    |    2 ++
 docs/SQLObject.rst      |   15 ++++++++++-----
 docs/Versioning.rst     |    2 ++
 docs/index.rst          |   11 +++++------
 docs/links.rst          |    2 ++
 7 files changed, 26 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs updated. 3.0.0-70-g407f6b9

From: Oleg B. <no...@so...> - 2016-08-11 17:54:33

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  f4c578676fb4bab7523f2409b1deb4e4510ad773 (commit)
       via  407f6b93b1fd90d570aa7e6cbb49af291b368da3 (commit)
       via  d2a3988f42e27a45702d5a3657d2d6ad0bf449d0 (commit)
       via  909daf64ff3b64d805179c167dd7cb83ced7cc77 (commit)
       via  6dacf9094f7951597542b1427a9e59943ef7565a (commit)
       via  3835a96cb817de643d5be2ad1d12469eed033bf6 (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 (f4c578676fb4bab7523f2409b1deb4e4510ad773)
            \
             N -- N -- N (407f6b93b1fd90d570aa7e6cbb49af291b368da3)

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/407f6b93b1fd90d570aa7e6cbb49af291b368da3

commit 407f6b93b1fd90d570aa7e6cbb49af291b368da3
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Feb 16 21:56:33 2015 +0300

    Generate docs using sphinx
    
    Use sphinx-apidoc to generate split API docs.

diff --git a/docs/.gitignore b/docs/.gitignore
index 5937020..cf1f956 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,4 @@
 /*.html
+/_build/
 /data.db
 /html
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..5188142
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,183 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SQLObject.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SQLObject.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
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
--- /dev/null
+++ b/docs/api/sqlobject.include.hashcol.rst
@@ -0,0 +1,7 @@
+sqlobject.include.hashcol module
+================================
+
+.. automodule:: sqlobject.include.hashcol
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.include.rst b/docs/api/sqlobject.include.rst
new file mode 100644
index 0000000..62086bf
--- /dev/null
+++ b/docs/api/sqlobject.include.rst
@@ -0,0 +1,22 @@
+sqlobject.include package
+=========================
+
+.. automodule:: sqlobject.include
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+    sqlobject.include.tests
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.include.hashcol
+
diff --git a/docs/api/sqlobject.include.tests.rst b/docs/api/sqlobject.include.tests.rst
new file mode 100644
index 0000000..e17b4de
--- /dev/null
+++ b/docs/api/sqlobject.include.tests.rst
@@ -0,0 +1,15 @@
+sqlobject.include.tests package
+===============================
+
+.. automodule:: sqlobject.include.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.include.tests.test_hashcol
+
diff --git a/docs/api/sqlobject.include.tests.test_hashcol.rst b/docs/api/sqlobject.include.tests.test_hashcol.rst
new file mode 100644
... 2200 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-69-gd2a3988

From: Oleg B. <no...@so...> - 2016-08-11 17:54:31

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  d2a3988f42e27a45702d5a3657d2d6ad0bf449d0 (commit)
       via  909daf64ff3b64d805179c167dd7cb83ced7cc77 (commit)
       via  6dacf9094f7951597542b1427a9e59943ef7565a (commit)
       via  3835a96cb817de643d5be2ad1d12469eed033bf6 (commit)
      from  7fd35a432ad78ad4a3d6138dc7a0a8c406a08c34 (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:
 .travis.yml           |    7 +++++++
 circle.yml            |    3 ++-
 sqlobject/.coveragerc |    3 ++-
 tox.ini               |    1 -
 4 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs updated. 3.0.0-66-gf4c5786

From: Oleg B. <no...@so...> - 2016-08-11 14:34:48

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  86ffdb3b4feaa2340815addc75ec846b1cc423f4 (commit)
       via  f4c578676fb4bab7523f2409b1deb4e4510ad773 (commit)
       via  7fd35a432ad78ad4a3d6138dc7a0a8c406a08c34 (commit)
       via  7691385d7ce69b6c9fb3e57a8875b1f82f23207d (commit)
       via  0feb579f0761cfa58a42ca79fa330d184184463c (commit)
       via  8890411f9cf8687ebbbec1269f68fa94d3ac344f (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 (86ffdb3b4feaa2340815addc75ec846b1cc423f4)
            \
             N -- N -- N (f4c578676fb4bab7523f2409b1deb4e4510ad773)

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

commit f4c578676fb4bab7523f2409b1deb4e4510ad773
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Feb 16 21:56:33 2015 +0300

    Generate docs using sphinx
    
    Use sphinx-apidoc to generate split API docs.

diff --git a/docs/.gitignore b/docs/.gitignore
index 5937020..cf1f956 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,4 @@
 /*.html
+/_build/
 /data.db
 /html
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..5188142
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,183 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SQLObject.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SQLObject.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
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
--- /dev/null
+++ b/docs/api/sqlobject.include.hashcol.rst
@@ -0,0 +1,7 @@
+sqlobject.include.hashcol module
+================================
+
+.. automodule:: sqlobject.include.hashcol
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.include.rst b/docs/api/sqlobject.include.rst
new file mode 100644
index 0000000..62086bf
--- /dev/null
+++ b/docs/api/sqlobject.include.rst
@@ -0,0 +1,22 @@
+sqlobject.include package
+=========================
+
+.. automodule:: sqlobject.include
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+    sqlobject.include.tests
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.include.hashcol
+
diff --git a/docs/api/sqlobject.include.tests.rst b/docs/api/sqlobject.include.tests.rst
new file mode 100644
index 0000000..e17b4de
--- /dev/null
+++ b/docs/api/sqlobject.include.tests.rst
@@ -0,0 +1,15 @@
+sqlobject.include.tests package
+===============================
+
+.. automodule:: sqlobject.include.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.include.tests.test_hashcol
+
diff --git a/docs/api/sqlobject.include.tests.test_hashcol.rst b/docs/api/sqlobject.include.tests.test_hashcol.rst
new file mode 100644
... 2203 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-65-g7fd35a4

From: Oleg B. <no...@so...> - 2016-08-11 06:30:58

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  7fd35a432ad78ad4a3d6138dc7a0a8c406a08c34 (commit)
       via  7691385d7ce69b6c9fb3e57a8875b1f82f23207d (commit)
       via  0feb579f0761cfa58a42ca79fa330d184184463c (commit)
       via  8890411f9cf8687ebbbec1269f68fa94d3ac344f (commit)
      from  0301abee2c622b0718d2181361bc9719d557af6c (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/7fd35a432ad78ad4a3d6138dc7a0a8c406a08c34

commit 7fd35a432ad78ad4a3d6138dc7a0a8c406a08c34
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Aug 11 07:47:10 2016 +0300

    Fix plural form
    
    [skip ci]

diff --git a/docs/News.rst b/docs/News.rst
index 3d80fe6..178d6d2 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -43,7 +43,7 @@ Source code
 Tests
 -----
 
-* Test are now run at Circle CI.
+* Tests are now run at Circle CI.
 
 * Use pytest-cov for test coverage. Report test coverage
   via coveralls.io and codecov.io.

http://sourceforge.net/p/sqlobject/sqlobject/ci/7691385d7ce69b6c9fb3e57a8875b1f82f23207d

commit 7691385d7ce69b6c9fb3e57a8875b1f82f23207d
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Aug 11 07:30:08 2016 +0300

    Include circle.yml and .coveragerc into source distribution
    
    [skip ci]

diff --git a/MANIFEST.in b/MANIFEST.in
index ca0fe85..228d7c1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,8 @@
 include .gitignore docs/.gitignore
 include MANIFEST.in ez_setup.py
-include .travis.yml tox.ini
+include .travis.yml circle.yml tox.ini
 include *.rst *.txt docs/LICENSE docs/*.rst docs/rebuild
+include sqlobject/.coveragerc sqlobject/.gitignore
 include sqlobject/maxdb/readme.txt
 recursive-include debian *
 recursive-include docs *.css *.html *.js *.gif *.py

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

commit 0feb579f0761cfa58a42ca79fa330d184184463c
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Aug 10 18:46:19 2016 +0300

    Add Codecov badge
    
    [skip ci]

diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
index 7b51967..225de5c 100644
--- a/docs/DeveloperGuide.rst
+++ b/docs/DeveloperGuide.rst
@@ -274,11 +274,14 @@ anywhere in your commit messages for commits that don't change code
 We use `coverage.py <https://pypi.python.org/pypi/coverage>`_
 to measures code coverage by tests and upload the result for analyzis to
 `Coveralls <https://coveralls.io/github/sqlobject/sqlobject>`_ and
-`Codecov <https://codecov.io/gh/sqlobject/sqlobject>`_.
+`Codecov <https://codecov.io/gh/sqlobject/sqlobject>`_:
 
 .. image:: https://coveralls.io/repos/github/sqlobject/sqlobject/badge.svg?branch=master
    :target: https://coveralls.io/github/sqlobject/sqlobject?branch=master
 
+.. image:: https://codecov.io/gh/sqlobject/sqlobject/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/sqlobject/sqlobject
+
 Documentation
 =============
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/8890411f9cf8687ebbbec1269f68fa94d3ac344f

commit 8890411f9cf8687ebbbec1269f68fa94d3ac344f
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Aug 10 18:45:39 2016 +0300

    Change wording: we now run tests not only at Travis
    
    [skip ci]

diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
index d2e2f16..7b51967 100644
--- a/docs/DeveloperGuide.rst
+++ b/docs/DeveloperGuide.rst
@@ -265,7 +265,7 @@ We now use Travis CI and Circle CI to run tests. See the statuses:
 .. image:: https://circleci.com/gh/sqlobject/sqlobject.svg?style=shield
    :target: https://circleci.com/gh/sqlobject/sqlobject
 
-To avoid triggering unnecessary test run at Travis add text
+To avoid triggering unnecessary test run at CI services add text
 `[skip ci] or [ci skip]
 <https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_
 anywhere in your commit messages for commits that don't change code

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

Summary of changes:
 MANIFEST.in             |    3 ++-
 docs/DeveloperGuide.rst |    7 +++++--
 docs/News.rst           |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs updated. 3.0.0-62-g86ffdb3

From: Oleg B. <no...@so...> - 2016-08-10 15:15:57

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  70115a80aa04cca16ea0d0e2283276a0cd2cc53b (commit)
       via  86ffdb3b4feaa2340815addc75ec846b1cc423f4 (commit)
       via  0301abee2c622b0718d2181361bc9719d557af6c (commit)
       via  539d6d0cca09c7d26eef7e3c20a88ea76b8570aa (commit)
       via  58b9fe8faf5cb78225a982b71a5775c217d1f2b0 (commit)
       via  5e83f5b9c9ff92c1b188a904edfcb5a10c8aac3c (commit)
       via  e17be44c57a217fb2d1c0741aa5ab14afad631c3 (commit)
       via  3d53e359aabaa0ca86cb7c319b2019dd269174d9 (commit)
       via  c05c32dc337b6c2a9c9750509d53641b0a8e865b (commit)
       via  12790bba0f012954f3811d54a5aeb546e629c7ff (commit)
       via  372fa6303abde2fa1afa32b44b3692614fc72c23 (commit)
       via  84097cfaf0a72e2a2390f4990168c319c6d619bc (commit)
       via  10059c1eff5e0031d188042bfecf92a1881a34e2 (commit)
       via  48e06c2db7d67b06a84015c19a9c909629568d69 (commit)
       via  e37b03a019184e9258e67da1716c4898c9d2b429 (commit)
       via  4ea1194ce9277b237e5ef65b65cb8d8b6718a9fc (commit)
       via  936732a0e84496343e2d357706e25b112c3221a3 (commit)
       via  d0f2abc7ce2011f2943f11a40ec7f71a72a2473f (commit)
       via  53bc9174aa2d6e72d8a5d3facdbc9f450fec4bc3 (commit)
       via  2476dfb15cf3f6c62f4c0c2c25ad59847687d496 (commit)
       via  dbfad29c3ab865a69d4661e3b2be96f3255e82db (commit)
       via  c5b45491c256f3d1bdbfce9775472c59faf8dde2 (commit)
       via  9785f246ee72d20f77fd5e9290bb59f587a49287 (commit)
       via  6ec83457d064928b2ecb1edca36b6824d029e9ab (commit)
       via  76b057eba4844088e72e319c18bffb94ee87b6a1 (commit)
       via  56bcb03d7c0b8b8c5e1d010913cf24d8d4aa153b (commit)
       via  0fbf8949b3a56e87582d7f08f592809d6fdba62b (commit)
       via  b4c5f02b368d8a3a570f2edf6150d0da4c7e503b (commit)
       via  4f62b3980d04c08ce4c9f058b1a89d44f2c85442 (commit)
       via  c442ad93897d7515b5d40b77af22212248b7e1c9 (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 (70115a80aa04cca16ea0d0e2283276a0cd2cc53b)
            \
             N -- N -- N (86ffdb3b4feaa2340815addc75ec846b1cc423f4)

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/86ffdb3b4feaa2340815addc75ec846b1cc423f4

commit 86ffdb3b4feaa2340815addc75ec846b1cc423f4
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Feb 16 21:56:33 2015 +0300

    Generate docs using sphinx
    
    Used sphinx-apidoc to generate split API docs.

diff --git a/docs/.gitignore b/docs/.gitignore
index 5937020..cf1f956 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,4 @@
 /*.html
+/_build/
 /data.db
 /html
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..5188142
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,183 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SQLObject.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SQLObject.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
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
--- /dev/null
+++ b/docs/api/sqlobject.include.hashcol.rst
@@ -0,0 +1,7 @@
+sqlobject.include.hashcol module
+================================
+
+.. automodule:: sqlobject.include.hashcol
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.include.rst b/docs/api/sqlobject.include.rst
new file mode 100644
index 0000000..b438105
--- /dev/null
+++ b/docs/api/sqlobject.include.rst
@@ -0,0 +1,15 @@
+sqlobject.include package
+=========================
+
+.. automodule:: sqlobject.include
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.include.hashcol
+
diff --git a/docs/api/sqlobject.include.tests.rst b/docs/api/sqlobject.include.tests.rst
new file mode 100644
index 0000000..e17b4de
--- /dev/null
+++ b/docs/api/sqlobject.include.tests.rst
@@ -0,0 +1,15 @@
... 2556 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-61-g0301abe

From: Oleg B. <no...@so...> - 2016-08-10 15:15:55

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  0301abee2c622b0718d2181361bc9719d557af6c (commit)
      from  539d6d0cca09c7d26eef7e3c20a88ea76b8570aa (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:
 README.rst               |    2 +-
 docs/News.rst            |    2 --
 setup.cfg                |    4 ++--
 setup.py                 |    5 ++---
 sqlobject/__version__.py |    4 ++--
 5 files changed, 7 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-60-g539d6d0

From: Oleg B. <no...@so...> - 2016-08-10 01:18:47

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  539d6d0cca09c7d26eef7e3c20a88ea76b8570aa (commit)
       via  58b9fe8faf5cb78225a982b71a5775c217d1f2b0 (commit)
       via  5e83f5b9c9ff92c1b188a904edfcb5a10c8aac3c (commit)
       via  e17be44c57a217fb2d1c0741aa5ab14afad631c3 (commit)
       via  3d53e359aabaa0ca86cb7c319b2019dd269174d9 (commit)
       via  c05c32dc337b6c2a9c9750509d53641b0a8e865b (commit)
      from  12790bba0f012954f3811d54a5aeb546e629c7ff (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/539d6d0cca09c7d26eef7e3c20a88ea76b8570aa

commit 539d6d0cca09c7d26eef7e3c20a88ea76b8570aa
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Aug 10 03:30:58 2016 +0300

    .coveragerc: omit modules and tests that aren't usually run
    
    We mostly run tests with MySQL, Postgres and SQLite.
    And we don't use Paste.

diff --git a/sqlobject/.coveragerc b/sqlobject/.coveragerc
new file mode 100644
index 0000000..b62e7f0
--- /dev/null
+++ b/sqlobject/.coveragerc
@@ -0,0 +1,10 @@
+[run]
+omit =
+   firebird/*.py
+   maxdb/*.py
+   mssql/*.py
+   rdbhost/*.py
+   sybase/*.py
+   tests/test_paste.py
+   util/threadinglocal.py
+   wsgi_middleare.py

http://sourceforge.net/p/sqlobject/sqlobject/ci/58b9fe8faf5cb78225a982b71a5775c217d1f2b0

commit 58b9fe8faf5cb78225a982b71a5775c217d1f2b0
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Aug 10 03:09:55 2016 +0300

    Convert timedelta to mxDateTime.Time
    
    MySQL returns timedelta for Time.

diff --git a/docs/News.rst b/docs/News.rst
index 0e3a3a5..939cdd9 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -24,6 +24,9 @@ Features
 
 * For Python >= 3.4 minimal FormEncode version is now 1.3.1.
 
+* If mxDateTime is in use, convert timedelta (returned by MySQL) to
+  mxDateTime.Time.
+
 Documentation
 -------------
 
diff --git a/sqlobject/col.py b/sqlobject/col.py
index f5a9571..e405127 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -1303,6 +1303,13 @@ if mxdatetime_available:
                 return DateTime.Date(value.year, value.month, value.day)
             elif isinstance(value, datetime.time):
                 return DateTime.Time(value.hour, value.minute, value.second)
+            elif isinstance(value, datetime.timedelta):
+                if value.days:
+                    raise validators.Invalid(
+                        "the value for the TimeCol '%s' must has days=0, "
+                        "it has days=%d" % (self.name, value.days),
+                        value, state)
+                return DateTime.Time(seconds=value.seconds)
             try:
                 if self.format.find(".%f") >= 0:
                     if '.' in value:

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

commit 5e83f5b9c9ff92c1b188a904edfcb5a10c8aac3c
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Aug 10 02:43:34 2016 +0300

    Install mxDateTime to run date/time tests with it
    
    Install egenix-mx-base (Python2 only) to run date/time tests
    with mxDateTime in addition to datetime.

diff --git a/docs/News.rst b/docs/News.rst
index 31be937..0e3a3a5 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -47,6 +47,8 @@ Tests
 * Use pytest-cov for test coverage. Report test coverage
   via coveralls.io and codecov.io.
 
+* Install mxDateTime to run date/time tests with it.
+
 SQLObject 3.0.0
 ===============
 
diff --git a/tox.ini b/tox.ini
index b31b733..c5f8e74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,7 @@ deps =
     pytest-cov
     py26,py27: FormEncode >= 1.1.1, != 1.3.0
     py34: FormEncode >= 1.3.1
+    py26,py27: egenix-mx-base
     PyDispatcher>=2.0.4
     mysql: mysql-python
     mysqlclient: mysqlclient

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

commit e17be44c57a217fb2d1c0741aa5ab14afad631c3
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Aug 10 02:00:24 2016 +0300

    Rename reStructuredText file from *.txt to *.rst
    
    [skip ci]

diff --git a/MANIFEST.in b/MANIFEST.in
index 3c13468..ca0fe85 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include .gitignore docs/.gitignore
 include MANIFEST.in ez_setup.py
 include .travis.yml tox.ini
-include *.txt docs/LICENSE docs/*.txt docs/rebuild
+include *.rst *.txt docs/LICENSE docs/*.rst docs/rebuild
 include sqlobject/maxdb/readme.txt
 recursive-include debian *
 recursive-include docs *.css *.html *.js *.gif *.py
diff --git a/README.txt b/README.rst
similarity index 88%
rename from README.txt
rename to README.rst
index abe9116..ace9309 100644
--- a/README.txt
+++ b/README.rst
@@ -10,4 +10,4 @@ through the `psycopg` package, SQLite, Firebird, MaxDB (SAP DB), MS SQL
 Sybase and Rdbhost.  Python 2.6, 2.7 or 3.4+ is required.
 
 For more information please see the documentation in
-docs/SQLObject.txt, or online at http://sqlobject.org/
+`<docs/SQLObject.rst>`_, or online at http://sqlobject.org/
diff --git a/debian/docs b/debian/docs
index 09b66e4..1a04c5f 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
-README.txt
+README.rst
 docs/
diff --git a/docs/Authors.txt b/docs/Authors.rst
similarity index 100%
rename from docs/Authors.txt
rename to docs/Authors.rst
diff --git a/docs/DeveloperGuide.txt b/docs/DeveloperGuide.rst
similarity index 100%
rename from docs/DeveloperGuide.txt
rename to docs/DeveloperGuide.rst
diff --git a/docs/FAQ.txt b/docs/FAQ.rst
similarity index 100%
rename from docs/FAQ.txt
rename to docs/FAQ.rst
diff --git a/docs/Inheritance.txt b/docs/Inheritance.rst
similarity index 100%
rename from docs/Inheritance.txt
rename to docs/Inheritance.rst
diff --git a/docs/News.txt b/docs/News.rst
similarity index 96%
rename from docs/News.txt
rename to docs/News.rst
index 5aa09dd..31be937 100644
--- a/docs/News.txt
+++ b/docs/News.rst
@@ -32,6 +32,8 @@ Documentation
 
 * Fix URLs that can be found; remove missing links.
 
+* Rename reStructuredText file from \*.txt to \*.rst.
+
 Source code
 -----------
 
diff --git a/docs/News1.txt b/docs/News1.rst
similarity index 100%
rename from docs/News1.txt
rename to docs/News1.rst
diff --git a/docs/News2.txt b/docs/News2.rst
similarity index 100%
rename from docs/News2.txt
rename to docs/News2.rst
diff --git a/docs/News3.txt b/docs/News3.rst
similarity index 100%
rename from docs/News3.txt
rename to docs/News3.rst
diff --git a/docs/News4.txt b/docs/News4.rst
similarity index 100%
rename from docs/News4.txt
rename to docs/News4.rst
diff --git a/docs/News5.txt b/docs/News5.rst
similarity index 100%
rename from docs/News5.txt
rename to docs/News5.rst
diff --git a/docs/Python3.txt b/docs/Python3.rst
similarity index 100%
rename from docs/Python3.txt
rename to docs/Python3.rst
diff --git a/docs/SQLBuilder.txt b/docs/SQLBuilder.rst
similarity index 100%
rename from docs/SQLBuilder.txt
rename to docs/SQLBuilder.rst
diff --git a/docs/SQLObject.txt b/docs/SQLObject.rst
similarity index 100%
rename from docs/SQLObject.txt
rename to docs/SQLObject.rst
diff --git a/docs/SelectResults.txt b/docs/SelectResults.rst
similarity index 100%
rename from docs/SelectResults.txt
rename to docs/SelectResults.rst
diff --git a/docs/TODO.txt b/docs/TODO.rst
similarity index 100%
rename from docs/TODO.txt
rename to docs/TODO.rst
diff --git a/docs/Versioning.txt b/docs/Versioning.rst
similarity index 100%
rename from docs/Versioning.txt
rename to docs/Versioning.rst
diff --git a/docs/Views.txt b/docs/Views.rst
similarity index 100%
rename from docs/Views.txt
rename to docs/Views.rst
diff --git a/docs/community.txt b/docs/community.rst
similarity index 100%
rename from docs/community.txt
rename to docs/community.rst
diff --git a/docs/download.txt b/docs/download.rst
similarity index 100%
rename from docs/download.txt
rename to docs/download.rst
diff --git a/docs/index.txt b/docs/index.rst
similarity index 100%
rename from docs/index.txt
rename to docs/index.rst
diff --git a/docs/links.txt b/docs/links.rst
similarity index 100%
rename from docs/links.txt
rename to docs/links.rst
diff --git a/docs/rebuild b/docs/rebuild
index 18235b5..c5313e0 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -12,11 +12,11 @@ NORMAL="Authors DeveloperGuide FAQ Inheritance
         community download index links sqlobject-admin"
 
 for NAME in $NORMAL ; do
-    if [ -e "$NAME.html" -a ! "$NAME.html" -ot "$NAME.txt" ] ; then
+    if [ -e "$NAME.html" -a ! "$NAME.html" -ot "$NAME.rst" ] ; then
         echo "$NAME is up to date."
         continue
     fi
     echo "Building $NAME."
     rst2html.py --no-toc-backlinks --stylesheet=default.css --link-stylesheet \
-        -- "$NAME.txt" > "$NAME.html"
+        -- "$NAME.rst" > "$NAME.html"
 done
diff --git a/docs/sqlobject-admin.txt b/docs/sqlobject-admin.rst
similarity index 100%
rename from docs/sqlobject-admin.txt
rename to docs/sqlobject-admin.rst
diff --git a/docs/test.py b/docs/test.py
old mode 100644
new mode 100755
index bf43dfa..991eaee
--- a/docs/test.py
+++ b/docs/test.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import doctest
 import os
 import sys
@@ -7,7 +8,7 @@ sys.path.insert(
 
 
 def test():
-    for doc in ['SQLObject.txt']:
+    for doc in ['SQLObject.rst']:
         doctest.testfile(doc, optionflags=doctest.ELLIPSIS)
 
 if __name__ == '__main__':
diff --git a/setup.cfg b/setup.cfg
index 9467786..24ef049 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,13 +17,13 @@ ignore = E401
 
 [pudge]
 theme = pythonpaste.org
-docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt
-	docs/Inheritance.txt docs/News.txt docs/News1.txt docs/News2.txt
-	docs/News3.txt docs/News4.txt docs/News5.txt docs/Python3.txt
-	docs/SQLBuilder.txt docs/SQLObject.txt docs/SelectResults.txt
-	docs/TODO.txt docs/Versioning.txt docs/Views.txt
-	docs/community.txt docs/download.txt docs/links.txt
-	docs/sqlobject-admin.txt
+docs = docs/index.rst docs/Authors.rst docs/DeveloperGuide.rst docs/FAQ.rst
+	docs/Inheritance.rst docs/News.rst docs/News1.rst docs/News2.rst
+	docs/News3.rst docs/News4.rst docs/News5.rst docs/Python3.rst
+	docs/SQLBuilder.rst docs/SQLObject.rst docs/SelectResults.rst
+	docs/TODO.rst docs/Versioning.rst docs/Views.rst
+	docs/community.rst docs/download.rst docs/links.rst
+	docs/sqlobject-admin.rst
 doc_base = docs/
 dest = docs/html
 modules = sqlobject
diff --git a/setup.py b/setup.py
index 86bbc32..650e81b 100755
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,7 @@ and `GitHub <https://github.com/sqlobject>`_.
       scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
       package_data={"sqlobject":
                     [
-                        "../docs/LICENSE", "../docs/*.txt", "../docs/*.css",
+                        "../docs/LICENSE", "../docs/*.rst", "../docs/*.css",
                         "../docs/html/*.html", "../docs/html/*.css",
                         "../docs/html/sqlobject/*.html",
                         "../docs/html/sqlobject/firebird/*.html",
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 38953d5..0ac510c 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -5,10 +5,10 @@ SQLObject
 :author: Ian Bicking <ia...@co...>
 
 SQLObject is a object-relational mapper.  See SQLObject.html or
-SQLObject.txt for more.
+SQLObject.rst for more.
 
 With the help by Oleg Broytman and many other contributors.
-See Authors.txt.
+See Authors.rst.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as

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

commit 3d53e359aabaa0ca86cb7c319b2019dd269174d9
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Aug 9 10:02:45 2016 +0300

    We also use Circle CI
    
    [skip ci]

diff --git a/docs/DeveloperGuide.txt b/docs/DeveloperGuide.txt
index ecd9a9c..d2e2f16 100644
--- a/docs/DeveloperGuide.txt
+++ b/docs/DeveloperGuide.txt
@@ -257,11 +257,14 @@ forced to write the test.  That's no fun for us, to just be writing
 tests.  So please, write tests; everything at least needs to be
 exercised, even if the tests are absolutely complete.
 
-We now use Travis CI to run tests. See the status:
+We now use Travis CI and Circle CI to run tests. See the statuses:
 
 .. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
    :target: https://travis-ci.org/sqlobject/sqlobject
 
+.. image:: https://circleci.com/gh/sqlobject/sqlobject.svg?style=shield
+   :target: https://circleci.com/gh/sqlobject/sqlobject
+
 To avoid triggering unnecessary test run at Travis add text
 `[skip ci] or [ci skip]
 <https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_
diff --git a/docs/News.txt b/docs/News.txt
index 40139d6..5aa09dd 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -40,6 +40,8 @@ Source code
 Tests
 -----
 
+* Test are now run at Circle CI.
+
 * Use pytest-cov for test coverage. Report test coverage
   via coveralls.io and codecov.io.
 

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

commit c05c32dc337b6c2a9c9750509d53641b0a8e865b
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Aug 9 09:59:45 2016 +0300

    Embed Coveralls badge in Developer Guide
    
    [skip ci]

diff --git a/docs/DeveloperGuide.txt b/docs/DeveloperGuide.txt
index a845271..ecd9a9c 100644
--- a/docs/DeveloperGuide.txt
+++ b/docs/DeveloperGuide.txt
@@ -260,7 +260,7 @@ exercised, even if the tests are absolutely complete.
 We now use Travis CI to run tests. See the status:
 
 .. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
-  :target: https://travis-ci.org/sqlobject/sqlobject
+   :target: https://travis-ci.org/sqlobject/sqlobject
 
 To avoid triggering unnecessary test run at Travis add text
 `[skip ci] or [ci skip]
@@ -273,6 +273,9 @@ to measures code coverage by tests and upload the result for analyzis to
 `Coveralls <https://coveralls.io/github/sqlobject/sqlobject>`_ and
 `Codecov <https://codecov.io/gh/sqlobject/sqlobject>`_.
 
+.. image:: https://coveralls.io/repos/github/sqlobject/sqlobject/badge.svg?branch=master
+   :target: https://coveralls.io/github/sqlobject/sqlobject?branch=master
+
 Documentation
 =============
 

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

Summary of changes:
 MANIFEST.in                                       |    2 +-
 README.txt => README.rst                          |    2 +-
 debian/docs                                       |    2 +-
 docs/{Authors.txt => Authors.rst}                 |    0
 docs/{DeveloperGuide.txt => DeveloperGuide.rst}   |   10 ++++++++--
 docs/{FAQ.txt => FAQ.rst}                         |    0
 docs/{Inheritance.txt => Inheritance.rst}         |    0
 docs/{News.txt => News.rst}                       |    9 +++++++++
 docs/{News1.txt => News1.rst}                     |    0
 docs/{News2.txt => News2.rst}                     |    0
 docs/{News3.txt => News3.rst}                     |    0
 docs/{News4.txt => News4.rst}                     |    0
 docs/{News5.txt => News5.rst}                     |    0
 docs/{Python3.txt => Python3.rst}                 |    0
 docs/{SQLBuilder.txt => SQLBuilder.rst}           |    0
 docs/{SQLObject.txt => SQLObject.rst}             |    0
 docs/{SelectResults.txt => SelectResults.rst}     |    0
 docs/{TODO.txt => TODO.rst}                       |    0
 docs/{Versioning.txt => Versioning.rst}           |    0
 docs/{Views.txt => Views.rst}                     |    0
 docs/{community.txt => community.rst}             |    0
 docs/{download.txt => download.rst}               |    0
 docs/{index.txt => index.rst}                     |    0
 docs/{links.txt => links.rst}                     |    0
 docs/rebuild                                      |    4 ++--
 docs/{sqlobject-admin.txt => sqlobject-admin.rst} |    0
 docs/test.py                                      |    3 ++-
 setup.cfg                                         |   14 +++++++-------
 setup.py                                          |    2 +-
 sqlobject/.coveragerc                             |   10 ++++++++++
 sqlobject/col.py                                  |    7 +++++++
 sqlobject/main.py                                 |    4 ++--
 tox.ini                                           |    1 +
 33 files changed, 52 insertions(+), 18 deletions(-)
 rename README.txt => README.rst (88%)
 rename docs/{Authors.txt => Authors.rst} (100%)
 rename docs/{DeveloperGuide.txt => DeveloperGuide.rst} (96%)
 rename docs/{FAQ.txt => FAQ.rst} (100%)
 rename docs/{Inheritance.txt => Inheritance.rst} (100%)
 rename docs/{News.txt => News.rst} (86%)
 rename docs/{News1.txt => News1.rst} (100%)
 rename docs/{News2.txt => News2.rst} (100%)
 rename docs/{News3.txt => News3.rst} (100%)
 rename docs/{News4.txt => News4.rst} (100%)
 rename docs/{News5.txt => News5.rst} (100%)
 rename docs/{Python3.txt => Python3.rst} (100%)
 rename docs/{SQLBuilder.txt => SQLBuilder.rst} (100%)
 rename docs/{SQLObject.txt => SQLObject.rst} (100%)
 rename docs/{SelectResults.txt => SelectResults.rst} (100%)
 rename docs/{TODO.txt => TODO.rst} (100%)
 rename docs/{Versioning.txt => Versioning.rst} (100%)
 rename docs/{Views.txt => Views.rst} (100%)
 rename docs/{community.txt => community.rst} (100%)
 rename docs/{download.txt => download.rst} (100%)
 rename docs/{index.txt => index.rst} (100%)
 rename docs/{links.txt => links.rst} (100%)
 rename docs/{sqlobject-admin.txt => sqlobject-admin.rst} (100%)
 mode change 100644 => 100755 docs/test.py
 create mode 100644 sqlobject/.coveragerc


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-54-g12790bb

From: Oleg B. <no...@so...> - 2016-08-09 03:41:54

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  12790bba0f012954f3811d54a5aeb546e629c7ff (commit)
       via  372fa6303abde2fa1afa32b44b3692614fc72c23 (commit)
       via  84097cfaf0a72e2a2390f4990168c319c6d619bc (commit)
       via  10059c1eff5e0031d188042bfecf92a1881a34e2 (commit)
       via  48e06c2db7d67b06a84015c19a9c909629568d69 (commit)
      from  e37b03a019184e9258e67da1716c4898c9d2b429 (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/12790bba0f012954f3811d54a5aeb546e629c7ff

commit 12790bba0f012954f3811d54a5aeb546e629c7ff
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Aug 9 06:26:24 2016 +0300

    For Python >= 3.4 minimal FormEncode version is now 1.3.1
    
    With FormEncode 1.3.1 we no longer need `rm FormEncode-1.3.0.whl` hack.

diff --git a/docs/News.txt b/docs/News.txt
index f5d3a99..40139d6 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -22,6 +22,8 @@ Features
 
 * Add JSONCol, a universal json column.
 
+* For Python >= 3.4 minimal FormEncode version is now 1.3.1.
+
 Documentation
 -------------
 
diff --git a/pip-install b/pip-install
deleted file mode 100755
index 144d76f..0000000
--- a/pip-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-# Remove broken FormEncode wheel
-rm -f "$HOME"/.cache/pip/wheels/89/df/07/2bb5e9f2c89f5dfa839a366f4148cfd1ee9bc9c661b7160cc6/FormEncode-1.3.0-py2.py3-none-any.whl
-
-exec pip install "$@"
diff --git a/requirements.txt b/requirements.txt
index b670458..8921406 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 --install-option="--compile --optimize"
 
-FormEncode >= 1.1.1; python_version >= '2.6' and python_version < '3.0'
-FormEncode >= 1.3.0; python_version >= '3.4'
+FormEncode >= 1.1.1, != 1.3.0; python_version >= '2.6' and python_version < '3.0'
+FormEncode >= 1.3.1; python_version >= '3.4'
 PyDispatcher >= 2.0.4
diff --git a/setup.py b/setup.py
index a5c4b88..86bbc32 100755
--- a/setup.py
+++ b/setup.py
@@ -31,9 +31,9 @@ if is_setuptools:
     """
     install_requires = []
     if (sys.version_info[0] == 2) and (sys.version_info[:2] >= (2, 6)):
-        install_requires.append("FormEncode>=1.1.1")
+        install_requires.append("FormEncode>=1.1.1,!=1.3.0")
     elif (sys.version_info[0] == 3) and (sys.version_info[:2] >= (3, 4)):
-        install_requires.append("FormEncode>=1.3.0")
+        install_requires.append("FormEncode>=1.3.1")
     else:
         raise ImportError("SQLObject requires Python 2.6, 2.7 or 3.4+")
     install_requires.append("PyDispatcher>=2.0.4")
diff --git a/tox.ini b/tox.ini
index 42a8e8e..b31b733 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,13 +17,12 @@ basepython =
 deps =
     pytest
     pytest-cov
-    py26,py27: FormEncode >= 1.1.1
-    py34: FormEncode >= 1.3.0
+    py26,py27: FormEncode >= 1.1.1, != 1.3.0
+    py34: FormEncode >= 1.3.1
     PyDispatcher>=2.0.4
     mysql: mysql-python
     mysqlclient: mysqlclient
     postgres: psycopg2
-install_command=./pip-install {opts} {packages}
 passenv = CI TRAVIS TRAVIS_*
 
 # MySQL test environments

http://sourceforge.net/p/sqlobject/sqlobject/ci/372fa6303abde2fa1afa32b44b3692614fc72c23

commit 372fa6303abde2fa1afa32b44b3692614fc72c23
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Aug 9 06:11:17 2016 +0300

    Simplify tox.ini fake8 env even further
    
    Use global changedir (sqlobject) and run with the current directory.

diff --git a/tox.ini b/tox.ini
index cd3e609..42a8e8e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -80,12 +80,10 @@ commands =
 basepython = python2.7
 deps =
     flake8
-changedir =
-commands = flake8 sqlobject
+commands = flake8 .
 
 [testenv:py34-flake8]
 basepython = python3.4
 deps =
     flake8
-changedir =
-commands = flake8 sqlobject
+commands = flake8 .

http://sourceforge.net/p/sqlobject/sqlobject/ci/84097cfaf0a72e2a2390f4990168c319c6d619bc

commit 84097cfaf0a72e2a2390f4990168c319c6d619bc
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Aug 9 05:26:54 2016 +0300

    Fix bashism: ~ => $HOME

diff --git a/pip-install b/pip-install
index 096e3b7..144d76f 100755
--- a/pip-install
+++ b/pip-install
@@ -1,6 +1,6 @@
 #! /bin/sh
 
 # Remove broken FormEncode wheel
-rm -f ~/.cache/pip/wheels/89/df/07/2bb5e9f2c89f5dfa839a366f4148cfd1ee9bc9c661b7160cc6/FormEncode-1.3.0-py2.py3-none-any.whl
+rm -f "$HOME"/.cache/pip/wheels/89/df/07/2bb5e9f2c89f5dfa839a366f4148cfd1ee9bc9c661b7160cc6/FormEncode-1.3.0-py2.py3-none-any.whl
 
 exec pip install "$@"

http://sourceforge.net/p/sqlobject/sqlobject/ci/10059c1eff5e0031d188042bfecf92a1881a34e2

commit 10059c1eff5e0031d188042bfecf92a1881a34e2
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Aug 9 05:22:38 2016 +0300

    Rename pip-wrapper -> pip-install

diff --git a/pip-wrapper b/pip-install
similarity index 100%
rename from pip-wrapper
rename to pip-install
diff --git a/tox.ini b/tox.ini
index e46c895..cd3e609 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ deps =
     mysql: mysql-python
     mysqlclient: mysqlclient
     postgres: psycopg2
-install_command=./pip-wrapper {opts} {packages}
+install_command=./pip-install {opts} {packages}
 passenv = CI TRAVIS TRAVIS_*
 
 # MySQL test environments

http://sourceforge.net/p/sqlobject/sqlobject/ci/48e06c2db7d67b06a84015c19a9c909629568d69

commit 48e06c2db7d67b06a84015c19a9c909629568d69
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 10:46:12 2016 +0300

    Enable pip cache on Travis

diff --git a/.travis.yml b/.travis.yml
index 42c10af..8ff1585 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: python
 
+cache: pip
+
 addons:
   postgresql: "9.4"
 

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

Summary of changes:
 .travis.yml      |    2 ++
 docs/News.txt    |    2 ++
 pip-wrapper      |    6 ------
 requirements.txt |    4 ++--
 setup.py         |    4 ++--
 tox.ini          |   11 ++++-------
 6 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100755 pip-wrapper


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-49-ge37b03a

From: Oleg B. <no...@so...> - 2016-08-08 00:35:31

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  e37b03a019184e9258e67da1716c4898c9d2b429 (commit)
       via  4ea1194ce9277b237e5ef65b65cb8d8b6718a9fc (commit)
       via  936732a0e84496343e2d357706e25b112c3221a3 (commit)
       via  d0f2abc7ce2011f2943f11a40ec7f71a72a2473f (commit)
       via  53bc9174aa2d6e72d8a5d3facdbc9f450fec4bc3 (commit)
       via  2476dfb15cf3f6c62f4c0c2c25ad59847687d496 (commit)
       via  dbfad29c3ab865a69d4661e3b2be96f3255e82db (commit)
       via  c5b45491c256f3d1bdbfce9775472c59faf8dde2 (commit)
      from  9785f246ee72d20f77fd5e9290bb59f587a49287 (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/e37b03a019184e9258e67da1716c4898c9d2b429

commit e37b03a019184e9258e67da1716c4898c9d2b429
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 03:00:21 2016 +0300

    Simplify flake8 tox.ini commands

diff --git a/tox.ini b/tox.ini
index cdc9809..e46c895 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,11 +81,11 @@ basepython = python2.7
 deps =
     flake8
 changedir =
-commands = flake8 {posargs:sqlobject/}
+commands = flake8 sqlobject
 
 [testenv:py34-flake8]
 basepython = python3.4
 deps =
     flake8
 changedir =
-commands = flake8 {posargs:sqlobject/}
+commands = flake8 sqlobject

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

commit 4ea1194ce9277b237e5ef65b65cb8d8b6718a9fc
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 02:42:04 2016 +0300

    Refactoring tox.ini
    
    Refactoring common commands for MySQL, PostgreSQL and SQLite.

diff --git a/tox.ini b/tox.ini
index bd5a210..cdc9809 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,49 +27,47 @@ install_command=./pip-wrapper {opts} {packages}
 passenv = CI TRAVIS TRAVIS_*
 
 # MySQL test environments
-[testenv:py26-mysql]
+[mysql]
 commands =
     mysql -e 'create database sqlobject_test;'
     py.test --cov=sqlobject -D mysql://root:@localhost/sqlobject_test
     mysql -e 'drop database sqlobject_test;'
 
+[testenv:py26-mysql]
+commands = {[mysql]commands}
+
 [testenv:py27-mysql]
-commands =
-    mysql -e 'create database sqlobject_test;'
-    py.test --cov=sqlobject -D mysql://root:@localhost/sqlobject_test
-    mysql -e 'drop database sqlobject_test;'
+commands = {[mysql]commands}
 
 # PostgreSQL test environments
-[testenv:py26-postgres]
+[postgresql]
 commands =
     psql -c 'create database sqlobject_test;' -U postgres
     py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
     psql -c 'drop database sqlobject_test;' -U postgres
 
+[testenv:py26-postgres]
+commands = {[postgresql]commands}
+
 [testenv:py27-postgres]
-commands =
-    psql -c 'create database sqlobject_test;' -U postgres
-    py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
-    psql -c 'drop database sqlobject_test;' -U postgres
+commands = {[postgresql]commands}
 
 [testenv:py34-postgres]
-commands =
-    psql -c 'create database sqlobject_test;' -U postgres
-    py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
-    psql -c 'drop database sqlobject_test;' -U postgres
+commands = {[postgresql]commands}
 
 # SQLite test environments
-[testenv:py26-sqlite]
+[sqlite]
 commands =
     py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
 
+[testenv:py26-sqlite]
+commands = {[sqlite]commands}
+
 [testenv:py27-sqlite]
-commands =
-    py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
+commands = {[sqlite]commands}
 
 [testenv:py34-sqlite]
-commands =
-    py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
+commands = {[sqlite]commands}
 
 # Special test environments
 [testenv:py34-mysqlclient]

http://sourceforge.net/p/sqlobject/sqlobject/ci/936732a0e84496343e2d357706e25b112c3221a3

commit 936732a0e84496343e2d357706e25b112c3221a3
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 02:32:13 2016 +0300

    Add 'requires' setup keyword

diff --git a/setup.py b/setup.py
index b54068e..a5c4b88 100755
--- a/setup.py
+++ b/setup.py
@@ -117,6 +117,7 @@ and `GitHub <https://github.com/sqlobject>`_.
                     ],
                     "sqlobject.maxdb": ["readme.txt"],
                     },
+      requires=['FormEncode', 'PyDispatcher'],
       **kw
       )
 

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

commit d0f2abc7ce2011f2943f11a40ec7f71a72a2473f
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 02:30:57 2016 +0300

    Different versions of FormEncode in install_requires
    
    Different versions of FormEncode for different python versions.

diff --git a/setup.py b/setup.py
index 309a2e5..b54068e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import sys
 from imp import load_source
 from os.path import abspath, dirname, join
 
@@ -28,7 +29,15 @@ if is_setuptools:
     [paste.filter_app_factory]
     main = sqlobject.wsgi_middleware:make_middleware
     """
-    kw['install_requires'] = ["FormEncode>=1.1.1", "PyDispatcher>=2.0.4"]
+    install_requires = []
+    if (sys.version_info[0] == 2) and (sys.version_info[:2] >= (2, 6)):
+        install_requires.append("FormEncode>=1.1.1")
+    elif (sys.version_info[0] == 3) and (sys.version_info[:2] >= (3, 4)):
+        install_requires.append("FormEncode>=1.3.0")
+    else:
+        raise ImportError("SQLObject requires Python 2.6, 2.7 or 3.4+")
+    install_requires.append("PyDispatcher>=2.0.4")
+    kw['install_requires'] = install_requires
     kw['extras_require'] = {
         'mysql': ['MySQLdb'],
         'postgresql': ['psycopg'],  # or pgdb from PyGreSQL

http://sourceforge.net/p/sqlobject/sqlobject/ci/53bc9174aa2d6e72d8a5d3facdbc9f450fec4bc3

commit 53bc9174aa2d6e72d8a5d3facdbc9f450fec4bc3
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 00:51:06 2016 +0300

    Run on Circle CI
    
    Circle CI allows caching, but broken FormEncode wheel must be removed
    for every major python version.

diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..c699d8b
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,8 @@
+dependencies:
+  cache_directories:
+    - ~/.cache/pip
+  override:
+    - sudo apt-get update && sudo apt-get install 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
diff --git a/pip-wrapper b/pip-wrapper
new file mode 100755
index 0000000..096e3b7
--- /dev/null
+++ b/pip-wrapper
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+# Remove broken FormEncode wheel
+rm -f ~/.cache/pip/wheels/89/df/07/2bb5e9f2c89f5dfa839a366f4148cfd1ee9bc9c661b7160cc6/FormEncode-1.3.0-py2.py3-none-any.whl
+
+exec pip install "$@"
diff --git a/tox.ini b/tox.ini
index e8b36e3..bd5a210 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,7 @@ deps =
     mysql: mysql-python
     mysqlclient: mysqlclient
     postgres: psycopg2
+install_command=./pip-wrapper {opts} {packages}
 passenv = CI TRAVIS TRAVIS_*
 
 # MySQL test environments

http://sourceforge.net/p/sqlobject/sqlobject/ci/2476dfb15cf3f6c62f4c0c2c25ad59847687d496

commit 2476dfb15cf3f6c62f4c0c2c25ad59847687d496
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 01:30:11 2016 +0300

    Group postgres test environments

diff --git a/tox.ini b/tox.ini
index 2ebbadf..e8b36e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,8 @@ envlist = {py26,py27}-mysql,{py26,py27,py34}-postgres,{py26,py27,py34}-sqlite,{p
 [testenv]
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    psql
     mysql
+    psql
 # Ensure we cd into sqlobject before running the tests
 changedir = ./sqlobject/
 basepython =
@@ -51,7 +51,13 @@ commands =
     py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
     psql -c 'drop database sqlobject_test;' -U postgres
 
-# sqlite test environments
+[testenv:py34-postgres]
+commands =
+    psql -c 'create database sqlobject_test;' -U postgres
+    py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
+    psql -c 'drop database sqlobject_test;' -U postgres
+
+# SQLite test environments
 [testenv:py26-sqlite]
 commands =
     py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
@@ -64,12 +70,7 @@ commands =
 commands =
     py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
 
-[testenv:py34-postgres]
-commands =
-    psql -c 'create database sqlobject_test;' -U postgres
-    py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
-    psql -c 'drop database sqlobject_test;' -U postgres
-
+# Special test environments
 [testenv:py34-mysqlclient]
 commands =
     mysql -e 'create database sqlobject_test;'

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

commit dbfad29c3ab865a69d4661e3b2be96f3255e82db
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 01:35:15 2016 +0300

    Python 2.6, 2.7 and 3.4 require different minimal versions of FormEncode

diff --git a/tox.ini b/tox.ini
index ce9db44..2ebbadf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,8 @@ basepython =
 deps =
     pytest
     pytest-cov
-    FormEncode >= 1.1.1
+    py26,py27: FormEncode >= 1.1.1
+    py34: FormEncode >= 1.3.0
     PyDispatcher>=2.0.4
     mysql: mysql-python
     mysqlclient: mysqlclient

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

commit c5b45491c256f3d1bdbfce9775472c59faf8dde2
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Aug 8 01:25:33 2016 +0300

    Require tox >= 1.8

diff --git a/requirements_dev.txt b/requirements_dev.txt
index a3e423e..ca2ff5d 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -2,4 +2,4 @@
 
 pytest
 pytest-cov
-tox
+tox >= 1.8

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

Summary of changes:
 circle.yml           |    8 +++++++
 pip-wrapper          |    6 +++++
 requirements_dev.txt |    2 +-
 setup.py             |   12 ++++++++++-
 tox.ini              |   53 +++++++++++++++++++++++++------------------------
 5 files changed, 53 insertions(+), 28 deletions(-)
 create mode 100644 circle.yml
 create mode 100755 pip-wrapper


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-41-g9785f24

From: Oleg B. <no...@so...> - 2016-08-07 02:33:15

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  9785f246ee72d20f77fd5e9290bb59f587a49287 (commit)
      from  6ec83457d064928b2ecb1edca36b6824d029e9ab (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/9785f246ee72d20f77fd5e9290bb59f587a49287

commit 9785f246ee72d20f77fd5e9290bb59f587a49287
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Aug 7 05:23:51 2016 +0300

    Add requirements for development and docs building
    
    Add requirements for development (pytest, coverage and tox)
    and docs building (pudge).

diff --git a/requirements_dev.txt b/requirements_dev.txt
new file mode 100644
index 0000000..a3e423e
--- /dev/null
+++ b/requirements_dev.txt
@@ -0,0 +1,5 @@
+-r requirements.txt
+
+pytest
+pytest-cov
+tox
diff --git a/requirements_docs.txt b/requirements_docs.txt
new file mode 100644
index 0000000..ee7cb22
--- /dev/null
+++ b/requirements_docs.txt
@@ -0,0 +1,5 @@
+-r requirements.txt
+
+buildutils
+kid >= 0.9.6
+pudge

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

Summary of changes:
 requirements_dev.txt  |    5 +++++
 requirements_docs.txt |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 requirements_dev.txt
 create mode 100644 requirements_docs.txt


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-40-g6ec8345

From: Oleg B. <no...@so...> - 2016-08-06 22:07:52

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  6ec83457d064928b2ecb1edca36b6824d029e9ab (commit)
       via  76b057eba4844088e72e319c18bffb94ee87b6a1 (commit)
      from  56bcb03d7c0b8b8c5e1d010913cf24d8d4aa153b (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/6ec83457d064928b2ecb1edca36b6824d029e9ab

commit 6ec83457d064928b2ecb1edca36b6824d029e9ab
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Aug 7 00:32:07 2016 +0300

    Fix pip command line
    
    [skip ci]

diff --git a/docs/download.txt b/docs/download.txt
index 97cfde3..07349a9 100644
--- a/docs/download.txt
+++ b/docs/download.txt
@@ -8,7 +8,7 @@ with `pip <https://pip.pypa.io/en/latest/>`_ or `easy_install
 
 You can install the latest release with::
 
-  pip -U SQLObject
+  pip install -U SQLObject
 
 or::
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/76b057eba4844088e72e319c18bffb94ee87b6a1

commit 76b057eba4844088e72e319c18bffb94ee87b6a1
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Aug 7 00:26:12 2016 +0300

    Add requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..b670458
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,5 @@
+--install-option="--compile --optimize"
+
+FormEncode >= 1.1.1; python_version >= '2.6' and python_version < '3.0'
+FormEncode >= 1.3.0; python_version >= '3.4'
+PyDispatcher >= 2.0.4

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

Summary of changes:
 docs/download.txt |    2 +-
 requirements.txt  |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)
 create mode 100644 requirements.txt


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-38-g56bcb03

From: Oleg B. <no...@so...> - 2016-08-06 19:37:17

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  56bcb03d7c0b8b8c5e1d010913cf24d8d4aa153b (commit)
       via  0fbf8949b3a56e87582d7f08f592809d6fdba62b (commit)
       via  b4c5f02b368d8a3a570f2edf6150d0da4c7e503b (commit)
       via  4f62b3980d04c08ce4c9f058b1a89d44f2c85442 (commit)
       via  c442ad93897d7515b5d40b77af22212248b7e1c9 (commit)
      from  e860578692889bdb61af6734fd7e156026379588 (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/56bcb03d7c0b8b8c5e1d010913cf24d8d4aa153b

commit 56bcb03d7c0b8b8c5e1d010913cf24d8d4aa153b
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 6 22:20:05 2016 +0300

    DevGuide update: we use coverage.py, Coveralls and Codecov
    
    [skip ci]

diff --git a/docs/DeveloperGuide.txt b/docs/DeveloperGuide.txt
index 8e9a020..a845271 100644
--- a/docs/DeveloperGuide.txt
+++ b/docs/DeveloperGuide.txt
@@ -268,6 +268,11 @@ To avoid triggering unnecessary test run at Travis add text
 anywhere in your commit messages for commits that don't change code
 (documentation updates and such).
 
+We use `coverage.py <https://pypi.python.org/pypi/coverage>`_
+to measures code coverage by tests and upload the result for analyzis to
+`Coveralls <https://coveralls.io/github/sqlobject/sqlobject>`_ and
+`Codecov <https://codecov.io/gh/sqlobject/sqlobject>`_.
+
 Documentation
 =============
 

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

commit 0fbf8949b3a56e87582d7f08f592809d6fdba62b
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 6 22:16:30 2016 +0300

    [skip ci] or [ci skip]

diff --git a/docs/DeveloperGuide.txt b/docs/DeveloperGuide.txt
index f2fd864..8e9a020 100644
--- a/docs/DeveloperGuide.txt
+++ b/docs/DeveloperGuide.txt
@@ -262,7 +262,8 @@ We now use Travis CI to run tests. See the status:
 .. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
   :target: https://travis-ci.org/sqlobject/sqlobject
 
-To avoid triggering unnecessary test run at Travis add text `[ci skip]
+To avoid triggering unnecessary test run at Travis add text
+`[skip ci] or [ci skip]
 <https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_
 anywhere in your commit messages for commits that don't change code
 (documentation updates and such).

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

commit b4c5f02b368d8a3a570f2edf6150d0da4c7e503b
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 6 21:30:03 2016 +0300

    Report test coverage via codecov.io

diff --git a/.travis.yml b/.travis.yml
index daa85d7..42c10af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ env:
   - TOXENV=py27-flake8
   - TOXENV=py34-flake8
 
-install: pip install tox coveralls
+install: pip install tox coveralls codecov
 
 matrix:
   fast_finish: true
@@ -26,3 +26,4 @@ script: tox -e ${TOXENV}
 after_success:
     - cd sqlobject
     - coveralls
+    - codecov
diff --git a/docs/News.txt b/docs/News.txt
index b30bfbf..f5d3a99 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -39,7 +39,7 @@ Tests
 -----
 
 * Use pytest-cov for test coverage. Report test coverage
-  via coveralls.io.
+  via coveralls.io and codecov.io.
 
 SQLObject 3.0.0
 ===============

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

commit 4f62b3980d04c08ce4c9f058b1a89d44f2c85442
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 6 21:15:23 2016 +0300

    Report test coverage via coveralls.io

diff --git a/.travis.yml b/.travis.yml
index b8fd838..daa85d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,13 @@ env:
   - TOXENV=py27-flake8
   - TOXENV=py34-flake8
 
-install: pip install tox
+install: pip install tox coveralls
 
 matrix:
   fast_finish: true
 
 script: tox -e ${TOXENV}
+
+after_success:
+    - cd sqlobject
+    - coveralls
diff --git a/docs/News.txt b/docs/News.txt
index 7658ea2..b30bfbf 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -38,7 +38,8 @@ Source code
 Tests
 -----
 
-* Use pytest-cov for test coverage.
+* Use pytest-cov for test coverage. Report test coverage
+  via coveralls.io.
 
 SQLObject 3.0.0
 ===============

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

commit c442ad93897d7515b5d40b77af22212248b7e1c9
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Aug 6 21:05:43 2016 +0300

    Use pytest-cov for test coverage

diff --git a/docs/News.txt b/docs/News.txt
index c2439c3..7658ea2 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -22,11 +22,6 @@ Features
 
 * Add JSONCol, a universal json column.
 
-Source code
------------
-
-* Fix all `import *` using https://github.com/zestyping/star-destroyer.
-
 Documentation
 -------------
 
@@ -35,6 +30,16 @@ Documentation
 
 * Fix URLs that can be found; remove missing links.
 
+Source code
+-----------
+
+* Fix all `import *` using https://github.com/zestyping/star-destroyer.
+
+Tests
+-----
+
+* Use pytest-cov for test coverage.
+
 SQLObject 3.0.0
 ===============
 
diff --git a/sqlobject/.gitignore b/sqlobject/.gitignore
new file mode 100644
index 0000000..b53725c
--- /dev/null
+++ b/sqlobject/.gitignore
@@ -0,0 +1,2 @@
+/.coverage
+/coverage.xml
diff --git a/tox.ini b/tox.ini
index 4497785..ce9db44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,62 +16,63 @@ basepython =
     py34: python3.4
 deps =
     pytest
+    pytest-cov
     FormEncode >= 1.1.1
     PyDispatcher>=2.0.4
     mysql: mysql-python
     mysqlclient: mysqlclient
     postgres: psycopg2
-
+passenv = CI TRAVIS TRAVIS_*
 
 # MySQL test environments
 [testenv:py26-mysql]
 commands =
     mysql -e 'create database sqlobject_test;'
-    py.test -D mysql://root:@localhost/sqlobject_test
+    py.test --cov=sqlobject -D mysql://root:@localhost/sqlobject_test
     mysql -e 'drop database sqlobject_test;'
 
 [testenv:py27-mysql]
 commands =
     mysql -e 'create database sqlobject_test;'
-    py.test -D mysql://root:@localhost/sqlobject_test
+    py.test --cov=sqlobject -D mysql://root:@localhost/sqlobject_test
     mysql -e 'drop database sqlobject_test;'
 
 # PostgreSQL test environments
 [testenv:py26-postgres]
 commands =
     psql -c 'create database sqlobject_test;' -U postgres
-    py.test -D postgres://postgres:@localhost/sqlobject_test
+    py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
     psql -c 'drop database sqlobject_test;' -U postgres
 
 [testenv:py27-postgres]
 commands =
     psql -c 'create database sqlobject_test;' -U postgres
-    py.test -D postgres://postgres:@localhost/sqlobject_test
+    py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
     psql -c 'drop database sqlobject_test;' -U postgres
 
 # sqlite test environments
 [testenv:py26-sqlite]
 commands =
-    py.test -D sqlite:///tmp/sqlobject_test.sqdb
+    py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
 
 [testenv:py27-sqlite]
 commands =
-    py.test -D sqlite:///tmp/sqlobject_test.sqdb
+    py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
 
 [testenv:py34-sqlite]
 commands =
-    py.test -D sqlite:///tmp/sqlobject_test.sqdb
+    py.test --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb
 
 [testenv:py34-postgres]
 commands =
     psql -c 'create database sqlobject_test;' -U postgres
-    py.test -D postgres://postgres:@localhost/sqlobject_test
+    py.test --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test
     psql -c 'drop database sqlobject_test;' -U postgres
 
 [testenv:py34-mysqlclient]
 commands =
     mysql -e 'create database sqlobject_test;'
-    py.test -D mysql://root:@localhost/sqlobject_test?charset=utf8
+    py.test --cov=sqlobject -D mysql://root:@localhost/sqlobject_test?charset=utf8
     mysql -e 'drop database sqlobject_test;'
 
 [testenv:py27-flake8]

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

Summary of changes:
 .travis.yml             |    7 ++++++-
 docs/DeveloperGuide.txt |    8 +++++++-
 docs/News.txt           |   16 +++++++++++-----
 sqlobject/.gitignore    |    2 ++
 tox.ini                 |   21 +++++++++++----------
 5 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 sqlobject/.gitignore


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch sphinx-docs created. 3.0.0-34-g70115a8

From: Oleg B. <no...@so...> - 2016-08-05 20:41:57

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 created
        at  70115a80aa04cca16ea0d0e2283276a0cd2cc53b (commit)

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/70115a80aa04cca16ea0d0e2283276a0cd2cc53b

commit 70115a80aa04cca16ea0d0e2283276a0cd2cc53b
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Feb 16 21:56:33 2015 +0300

    Generate docs using sphinx
    
    Used sphinx-apidoc to generate split API docs.

diff --git a/docs/.gitignore b/docs/.gitignore
index 5937020..cf1f956 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,3 +1,4 @@
 /*.html
+/_build/
 /data.db
 /html
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..5188142
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,183 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SQLObject.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SQLObject.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SQLObject"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
diff --git a/docs/api/modules.txt b/docs/api/modules.txt
new file mode 100644
index 0000000..656ed22
--- /dev/null
+++ b/docs/api/modules.txt
@@ -0,0 +1,7 @@
+sqlobject
+=========
+
+.. toctree::
+   :maxdepth: 4
+
+   sqlobject
diff --git a/docs/api/sqlobject.boundattributes.txt b/docs/api/sqlobject.boundattributes.txt
new file mode 100644
index 0000000..1518f8d
--- /dev/null
+++ b/docs/api/sqlobject.boundattributes.txt
@@ -0,0 +1,7 @@
+sqlobject.boundattributes module
+================================
+
+.. automodule:: sqlobject.boundattributes
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.cache.txt b/docs/api/sqlobject.cache.txt
new file mode 100644
index 0000000..6c74d5b
--- /dev/null
+++ b/docs/api/sqlobject.cache.txt
@@ -0,0 +1,7 @@
+sqlobject.cache module
+======================
+
+.. automodule:: sqlobject.cache
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.classregistry.txt b/docs/api/sqlobject.classregistry.txt
new file mode 100644
index 0000000..0882491
--- /dev/null
+++ b/docs/api/sqlobject.classregistry.txt
@@ -0,0 +1,7 @@
+sqlobject.classregistry module
+==============================
+
+.. automodule:: sqlobject.classregistry
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.col.txt b/docs/api/sqlobject.col.txt
new file mode 100644
index 0000000..5282fc2
--- /dev/null
+++ b/docs/api/sqlobject.col.txt
@@ -0,0 +1,7 @@
+sqlobject.col module
+====================
+
+.. automodule:: sqlobject.col
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.conftest.txt b/docs/api/sqlobject.conftest.txt
new file mode 100644
index 0000000..8e56428
--- /dev/null
+++ b/docs/api/sqlobject.conftest.txt
@@ -0,0 +1,7 @@
+sqlobject.conftest module
+=========================
+
+.. automodule:: sqlobject.conftest
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.constraints.txt b/docs/api/sqlobject.constraints.txt
new file mode 100644
index 0000000..ad39272
--- /dev/null
+++ b/docs/api/sqlobject.constraints.txt
@@ -0,0 +1,7 @@
+sqlobject.constraints module
+============================
+
+.. automodule:: sqlobject.constraints
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.converters.txt b/docs/api/sqlobject.converters.txt
new file mode 100644
index 0000000..82b5cff
--- /dev/null
+++ b/docs/api/sqlobject.converters.txt
@@ -0,0 +1,7 @@
+sqlobject.converters module
+===========================
+
+.. automodule:: sqlobject.converters
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dbconnection.txt b/docs/api/sqlobject.dbconnection.txt
new file mode 100644
index 0000000..6a6adc3
--- /dev/null
+++ b/docs/api/sqlobject.dbconnection.txt
@@ -0,0 +1,7 @@
+sqlobject.dbconnection module
+=============================
+
+.. automodule:: sqlobject.dbconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.dberrors.txt b/docs/api/sqlobject.dberrors.txt
new file mode 100644
index 0000000..3035746
--- /dev/null
+++ b/docs/api/sqlobject.dberrors.txt
@@ -0,0 +1,7 @@
+sqlobject.dberrors module
+=========================
+
+.. automodule:: sqlobject.dberrors
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.declarative.txt b/docs/api/sqlobject.declarative.txt
new file mode 100644
index 0000000..9cc7e9b
--- /dev/null
+++ b/docs/api/sqlobject.declarative.txt
@@ -0,0 +1,7 @@
+sqlobject.declarative module
+============================
+
+.. automodule:: sqlobject.declarative
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.events.txt b/docs/api/sqlobject.events.txt
new file mode 100644
index 0000000..8c33239
--- /dev/null
+++ b/docs/api/sqlobject.events.txt
@@ -0,0 +1,7 @@
+sqlobject.events module
+=======================
+
+.. automodule:: sqlobject.events
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.firebirdconnection.txt b/docs/api/sqlobject.firebird.firebirdconnection.txt
new file mode 100644
index 0000000..6fdf26e
--- /dev/null
+++ b/docs/api/sqlobject.firebird.firebirdconnection.txt
@@ -0,0 +1,7 @@
+sqlobject.firebird.firebirdconnection module
+============================================
+
+.. automodule:: sqlobject.firebird.firebirdconnection
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.firebird.txt b/docs/api/sqlobject.firebird.txt
new file mode 100644
index 0000000..78cec9a
--- /dev/null
+++ b/docs/api/sqlobject.firebird.txt
@@ -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.txt b/docs/api/sqlobject.include.hashcol.txt
new file mode 100644
index 0000000..76396aa
--- /dev/null
+++ b/docs/api/sqlobject.include.hashcol.txt
@@ -0,0 +1,7 @@
+sqlobject.include.hashcol module
+================================
+
+.. automodule:: sqlobject.include.hashcol
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.include.txt b/docs/api/sqlobject.include.txt
new file mode 100644
index 0000000..b438105
--- /dev/null
+++ b/docs/api/sqlobject.include.txt
@@ -0,0 +1,15 @@
+sqlobject.include package
+=========================
+
+.. automodule:: sqlobject.include
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Submodules
+----------
+
+.. toctree::
+
+   sqlobject.include.hashcol
+
diff --git a/docs/api/sqlobject.index.txt b/docs/api/sqlobject.index.txt
new file mode 100644
index 0000000..bc96433
--- /dev/null
+++ b/docs/api/sqlobject.index.txt
@@ -0,0 +1,7 @@
+sqlobject.index module
+======================
+
+.. automodule:: sqlobject.index
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.iteration.txt b/docs/api/sqlobject.inheritance.iteration.txt
new file mode 100644
index 0000000..0e9538f
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.iteration.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.iteration module
+======================================
+
+.. automodule:: sqlobject.inheritance.iteration
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt b/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt
new file mode 100644
index 0000000..7dc60f6
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.testDestroyCascade.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.testDestroyCascade module
+=====================================================
+
+.. automodule:: sqlobject.inheritance.tests.testDestroyCascade
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.test_aggregates.txt b/docs/api/sqlobject.inheritance.tests.test_aggregates.txt
new file mode 100644
index 0000000..ee01f6b
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.test_aggregates.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.test_aggregates module
+==================================================
+
+.. automodule:: sqlobject.inheritance.tests.test_aggregates
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/api/sqlobject.inheritance.tests.test_asdict.txt b/docs/api/sqlobject.inheritance.tests.test_asdict.txt
new file mode 100644
index 0000000..ff95591
--- /dev/null
+++ b/docs/api/sqlobject.inheritance.tests.test_asdict.txt
@@ -0,0 +1,7 @@
+sqlobject.inheritance.tests.test_asdict module
+==============================================
+
+.. automodule:: sqlobject.inheritance.tests.test_asdict
+    :members:
+    :undoc-members:
+    :show-inheritance:
... 2045 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-33-ge860578

From: Oleg B. <no...@so...> - 2016-07-31 18:22:21

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  e860578692889bdb61af6734fd7e156026379588 (commit)
       via  0cc426a03eca29d93de16cf2adf3da17def04bf0 (commit)
      from  98dba3a121452518fcf5c1828043b5db7a91aaa4 (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/e860578692889bdb61af6734fd7e156026379588

commit e860578692889bdb61af6734fd7e156026379588
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Jul 31 20:53:21 2016 +0300

    Release 3.1.0b1

diff --git a/README.txt b/README.txt
index d4b129a..abe9116 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,5 @@
-SQLObject 3.1.0
-===============
+SQLObject 3.1.0b1
+=================
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational
 mapper, i.e., a library that will wrap your database tables in Python
diff --git a/docs/News.txt b/docs/News.txt
index 326a728..c2439c3 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -7,8 +7,10 @@ News
 
 .. _start:
 
-SQLObject 3.1.0 (master)
-========================
+SQLObject 3.1.0
+===============
+
+Released 31 Jun 2016.
 
 Features
 --------
diff --git a/setup.cfg b/setup.cfg
index 0fb1c02..9467786 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -48,9 +48,9 @@ doc-dir = docs/html
 make-dirs = 1
 
 ## For live documentation:
-doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/
+# doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/
 ## For in-development documentation:
-# doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/devel/
+doc-dest = scp://web.sourceforge.net:/home/project-web/sqlobject/devel/
 
 [bdist_wheel]
 universal = 1
diff --git a/setup.py b/setup.py
index 834893d..309a2e5 100755
--- a/setup.py
+++ b/setup.py
@@ -81,7 +81,8 @@ and `GitHub <https://github.com/sqlobject>`_.
       maintainer="Oleg Broytman",
       maintainer_email="ph...@ph...",
       url="http://sqlobject.org/devel/",
-      download_url="https://pypi.python.org/pypi/SQLObject/%s" % version,
+      download_url="https://pypi.python.org/pypi/SQLObject/%sdev-20160731" %
+          version,
       license="LGPL",
       packages=["sqlobject"] +
           ['sqlobject.%s' % package for package in subpackages],
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index f1ebb14..d381316 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,8 +1,8 @@
 
-version = '3.1.0'
+version = '3.1.0b1'
 major = 3
 minor = 1
 micro = 0
-release_level = 'trunk'
-serial = 0
+release_level = 'beta'
+serial = 1
 version_info = (major, minor, micro, release_level, serial)

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

commit 0cc426a03eca29d93de16cf2adf3da17def04bf0
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Jul 31 20:04:24 2016 +0300

    Split News.txt into News5.txt

diff --git a/docs/News.txt b/docs/News.txt
index 459cdfc..326a728 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -60,632 +60,9 @@ Documentation
 * Documentation is published at http://sqlobject.readthedocs.org/ in
   Sphinx format.
 
-SQLObject 2.2.1
-===============
-
-Released 10 May 2016.
-
-* Fix a bug in sqlbuilder.CONCAT (inherit from SQLExpression).
-
-SQLObject 2.2.0
-===============
-
-Released 8 May 2016.
-
-Features & Interface
---------------------
-
-* Add function col.use_microseconds(True/False). Default is to use
-  microseconds (True).
-
-* For MSSQL use datetime2(6) and time(6) columns.
-
-* Columns for ForeignKey are created using idType of the referenced
-  table.
-
-Minor features
---------------
-
-* Add sqlbuilder.CONCAT to generate concatenation command (either using
-  function CONCAT() or '||' operator).
-
-* Minor refactoring to pave the way to Python 3 was merged from
-  `SQLObject 1.6.7`_.
-
-* Document MSSQL server versions -- merged from `SQLObject 1.7.6`_.
-
-Bugfixes
---------
-
-* Fix a bug: mxDateTime doesn't support microseconds; %s in mxDateTime
-  format means ticks.
-
-Tests
------
-
-* Speedup SQLite connections in tests -- merged from `SQLObject 1.7.6`_.
-
-* Added new test helper setupCyclicClasses to setup classes with mutual
-  references.
-
-SQLObject 2.1.2
-===============
-
-Released 15 Mar 2015.
-
-* Using fdb adapter for Firebird was ported from `SQLObject 1.6.6`_.
-
-SQLObject 2.1.1
-===============
-
-Released 10 Mar 2015.
-
-* Minor fix in PostgresConnection was ported from `SQLObject 1.6.5`_.
-
-SQLObject 2.1.0
-===============
-
-Released 6 Jan 2015.
-
-Minor features
---------------
-
-* In queries generated with SQLObject's tables columns are sorted in the
-  order they are declared in the table.
-
-* In queries generated with sqlbuilder's Insert/Update, if values are
-  passed using dictionaries, columns are sorted alphabetically.
-
-* Tables in SELECT...FROM clause are sorted alphabetically.
-
-* MySQLConnection, PostgresConnection and SQLiteConnection have got
-  a new method listDatabases() that lists databases in the connection
-  and returns a list of names.
-
-* MySQLConnection, PostgresConnection and SQLiteConnection have got
-  a new method listTables() that returns a list of table names in the database.
-
-SQLObject 2.0.0
-===============
-
-Released 20 Dec 2014.
-
-Features & Interface
---------------------
-
-* DateTimeCol and TimeCol can read and write values with microseconds.
-
-  WARNING: microseconds are supported by MariaDB since version 5.3.0 and
-  by MySQL since version 5.6.4, and even these versions require special
-  handling: columns to store microseconds have to be declared with
-  precision 6: TIME(6), DATETIME(6), TIMESTAMP(6). SQLObject does the
-  right thing when creating a new database but existing databases have
-  to be changed: run something like
-  ``ALTER TABLE name MODIFY COLUMN col TIME(6)`` for every column that
-  you want to store microseconds.
-
-  For MSSQL use datetime2(6) and time(6) columns. They are available
-  since MS SQL Server 2008.
-
-  WARNING: backward compatibility problem! Date/Time columns created
-  with microseconds cannot be read back from SQLite databases (and
-  perhaps other backends) with versions of SQLObject older than 1.7.
-
-Minor features
---------------
-
-* PostgresConnection, when used with fromDatabase=True, sets alternateID
-  for unique columns.
-
-Development
------------
-
-* Development was switched from Subversion to git.
-
-Documentation
--------------
-
-* Old news were restored back to version 0.2.1.
-
-* News.txt was split into 5 small files.
-
-SQLObject 1.7.6
-===============
-
-* Minor refactoring to pave the way to Python 3 was merged from
-  `SQLObject 1.6.7`_.
-
-* Document MSSQL server versions -- merged from `SQLObject 1.6.7`_.
-
-* Speedup SQLite connections in tests -- merged from `SQLObject 1.6.7`_.
-
-SQLObject 1.7.5
-===============
-
-Released 15 Mar 2015.
-
-* Using fdb adapter for Firebird was ported from `SQLObject 1.6.6`_.
-
-SQLObject 1.7.4
-===============
-
-Released 10 Mar 2015.
-
-* Minor fix in PostgresConnection was ported from `SQLObject 1.6.5`_.
-
-SQLObject 1.7.3
-===============
-
-Released 18 Dec 2014.
-
-* Documentation updates and setup.py change were ported
-  from `SQLObject 1.5.6`_.
-
-SQLObject 1.7.2
-===============
-
-Released 14 Dec 2014.
-
-* Fix a bug: zero-pad microseconds on the right, not on the left; 0.0835
-  seconds means 83500 microseconds.
-
-SQLObject 1.7.1
-===============
-
-Released 11 Dec 2014.
-
-* Documentation updates and setuptools change were ported
-  from `SQLObject 1.5.5`_.
-
-SQLObject 1.7.0
-===============
-
-Released 8 Dec 2014.
-
-Features & Interface
---------------------
-
-* Python 2.5 is no longer supported. The minimal supported version is
-  Python 2.6.
-
-* DateTimeCol and TimeCol can read values with microseconds (created by
-  SQLObject 2.0) but do not write microseconds back.
-
-Minor features
---------------
-
-* Upgrade ez_setup to 2.2.
-
-Bugfixes
---------
-
-* Thre bugfixes were ported from `SQLObject 1.5.2`_, `SQLObject 1.5.3`_
-  and `SQLObject 1.5.4`_.
-
-SQLObject 1.6.7
-===============
-
-* Minor refactoring to pave the way to Python 3: replace calls like
-  ``unicode(data, encoding)`` with ``data.decode(encoding)``.
-
-* Document MSSQL server versions.
-
-* Minor fix in HashCol.
-
-* Speedup SQLite connections in tests.
-
-SQLObject 1.6.6
-===============
-
-Released 15 Mar 2015.
-
-* Use fdb adapter for Firebird.
-
-SQLObject 1.6.5
-===============
-
-Released 10 Mar 2015.
-
-* Minor fix in PostgresConnection: close the cursor and connection
-  in _createOrDropDatabase even after an error.
-
-SQLObject 1.6.4
-===============
-
-Released 18 Dec 2014.
-
-* Documentation updates and setup.py change were ported
-  from `SQLObject 1.5.6`_.
-
-SQLObject 1.6.3
-===============
-
-Released 11 Dec 2014.
-
-* Documentation updates and setuptools change were ported
-  from `SQLObject 1.5.5`_.
-
-SQLObject 1.6.2
-===============
-
-Released 8 Dec 2014.
-
-* A bugfix was ported from `SQLObject 1.5.4`_.
-
-SQLObject 1.6.1
-===============
-
-Released 26 Oct 2014.
-
-* A bugfix was ported from `SQLObject 1.5.3`_.
-
-SQLObject 1.6.0
-===============
-
-Released 15 May 2014.
-
-Features & Interface
---------------------
-
-* Python 2.4 is no longer supported. The minimal supported version is
-  Python 2.5.
-
-* Support for Python 2.5 is declared obsolete and will be removed
-  in the next release.
-
-Minor features
---------------
-
-* Upgrade ez_setup to 1.4.2.
-
-Bugfixes
---------
-
-* A bugfix was ported from `SQLObject 1.5.2`_.
-
-Development
------------
-
-* Development switched from Subvesion to git.
-
-SQLObject 1.5.6
-===============
-
-Released 18 Dec 2014.
-
-* Extend setup.py: include docs and tests into the egg.
-
-SQLObject 1.5.5
-===============
-
-Released 11 Dec 2014.
-
-* Documentation update: change URLs for development with git, add
-  Travis CI build status image.
-
-* Extend sdist: include everything into source distribution.
-
-SQLObject 1.5.4
-===============
-
-Released 8 Dec 2014.
-
-* Fix a minor bug in MSSQLConnection: do not override callable server_version
-  with a non-callable.
-
-SQLObject 1.5.3
-===============
-
-Released 26 Oct 2014.
-
-* Allow unicode in .orderBy(u'-column').
-
-Development
------------
-
-* Development switched from Subvesion to git.
-
-SQLObject 1.5.2
-===============
-
-Released 13 Apr 2014.
-
-* Adapt duplicate error message strings for SQLite 3.8.
-
-SQLObject 1.5.1
-===============
-
-Released 15 Dec 2013.
-
-* SQLiteConnection.close() now closes and reopens a connection
-  to in-memory database.
-
-SQLObject 1.5.0
-===============
-
-Released 5 Oct 2013.
-
-Features & Interface
---------------------
-
-* Helpers for class Outer were changed to lookup columns in table's
-  declarations.
-
-* Support for Python 2.4 is declared obsolete and will be removed
-  in the next release.
-
-Minor features
---------------
-
-* When a PostgresConnection raises an exception the instance has
-  code/error attributes copied from psycopg2's pgcode/pgerror attributes.
-
-* Encode unicode enum values to str.
-
-* Removed setDeprecationLevel from the list of public functions.
-
-* A number of fixes for tests.
-
-Bugfixes
---------
-
-* A bug was fixed in DBConnection.close(); close() doesn't raise
-  an UnboundLocalError if connection pool is empty.
-
-* Fixed parameters for pymssql.
-
-Documentation
--------------
-
-* GNU LGPL text was added as docs/LICENSE file.
-
-* Old FSF address was changed to the new one.
-
-SQLObject 1.4.1
-===============
-
-Released 26 May 2013.
-
-* A few bugfixes were ported from `SQLObject 1.3.3`_.
-
-SQLObject 1.4.0
-===============
-
... 352 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 2.2 deleted. 2.2.1

From: Oleg B. <no...@so...> - 2016-07-31 16:47:41

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, 2.2 has been deleted
       was  c3c82cc58dbb861a228e3f355f69c07c28e36462

- Log -----------------------------------------------------------------
c3c82cc58dbb861a228e3f355f69c07c28e36462 Release 2.2.1
-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 1.7 deleted. 1.7.5-12-g8d282f7

From: Oleg B. <no...@so...> - 2016-07-31 16:47:38

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, 1.7 has been deleted
       was  8d282f7603f95b8ac8706f3ce216d000f4742f65

- Log -----------------------------------------------------------------
8d282f7603f95b8ac8706f3ce216d000f4742f65 Merge branch '1.6' into 1.7
-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch 1.6 deleted. 1.6.6-5-g7ba9175

From: Oleg B. <no...@so...> - 2016-07-31 16:47:36

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, 1.6 has been deleted
       was  7ba9175dd2203ce3e4665b11802c8bd963f5b46d

- Log -----------------------------------------------------------------
7ba9175dd2203ce3e4665b11802c8bd963f5b46d SourceForge has finally switched to HTTPS
-----------------------------------------------------------------------


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-31-g98dba3a

From: Oleg B. <no...@so...> - 2016-07-31 16:08:47

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  98dba3a121452518fcf5c1828043b5db7a91aaa4 (commit)
       via  2eab57c70d74ddd381bb3dbaf6b06230e1800a7a (commit)
       via  2b8ed7907b2d6d967153dc7a017110d5da223442 (commit)
       via  4108cb228108046b78eabac785514d1ff1a8b603 (commit)
       via  e6a614b9f24716cccad1a429ad686163c58dbc70 (commit)
       via  748fef3d6dec41f71bf17e8881d2eed964154744 (commit)
       via  1992d96b4899fab6f44fef6bc83a6f1064fab3a5 (commit)
       via  f50c991fc8afa95839f54af693bf3e030a8b90dc (commit)
       via  4f00db5ec2214627e84bc6aee0a67dfcd377b6b0 (commit)
       via  b6c956398836711cfacac3d9b49ec40dbfe8377e (commit)
       via  b280bb34eac108cfca6381b1a418034db82f39d7 (commit)
      from  8aa40a8c3684059468b2ccf793dfe381033fd395 (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/98dba3a121452518fcf5c1828043b5db7a91aaa4

commit 98dba3a121452518fcf5c1828043b5db7a91aaa4
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Jul 31 01:18:24 2016 +0300

    Upgrade ez_setup.py

diff --git a/ez_setup.py b/ez_setup.py
index 1420c11..4ef3ee0 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,61 +1,59 @@
 #!/usr/bin/env python
-"""Bootstrap setuptools installation
 
-To use setuptools in your package's setup.py, include this
-file in the same directory and add this to the top of your setup.py::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
+"""
+Setuptools bootstrapping installer.
 
-To require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, simply supply
-the appropriate options to ``use_setuptools()``.
+Maintained at https://github.com/pypa/setuptools/tree/bootstrap.
 
-This file can also be run as a script to install or upgrade setuptools.
+Run this script to install or upgrade setuptools.
 """
+
 import os
 import shutil
 import sys
 import tempfile
-import tarfile
+import zipfile
 import optparse
 import subprocess
 import platform
 import textwrap
+import contextlib
+import json
+import codecs
 
 from distutils import log
 
 try:
+    from urllib.request import urlopen
+    from urllib.parse import urljoin
+except ImportError:
+    from urllib2 import urlopen
+    from urlparse import urljoin
+
+try:
     from site import USER_SITE
 except ImportError:
     USER_SITE = None
 
-DEFAULT_VERSION = "2.2"
-DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
+LATEST = object()
+DEFAULT_VERSION = LATEST
+DEFAULT_URL = "https://pypi.io/packages/source/s/setuptools/"
+DEFAULT_SAVE_DIR = os.curdir
+
 
 def _python_cmd(*args):
     """
+    Execute a command.
+
     Return True if the command succeeded.
     """
     args = (sys.executable,) + args
     return subprocess.call(args) == 0
 
-def _install(tarball, install_args=()):
-    # extracting the tarball
-    tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s', tmpdir)
-    old_wd = os.getcwd()
-    try:
-        os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        _extractall(tar)
-        tar.close()
-
-        # going in the directory
-        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-        os.chdir(subdir)
-        log.warn('Now working in %s', subdir)
 
+def _install(archive_filename, install_args=()):
+    """Install Setuptools."""
+    with archive_context(archive_filename):
         # installing
         log.warn('Installing Setuptools')
         if not _python_cmd('setup.py', 'install', *install_args):
@@ -63,93 +61,160 @@ def _install(tarball, install_args=()):
             log.warn('See the error message above.')
             # exitcode will be 2
             return 2
-    finally:
-        os.chdir(old_wd)
-        shutil.rmtree(tmpdir)
 
 
-def _build_egg(egg, tarball, to_dir):
-    # extracting the tarball
+def _build_egg(egg, archive_filename, to_dir):
+    """Build Setuptools egg."""
+    with archive_context(archive_filename):
+        # building an egg
+        log.warn('Building a Setuptools egg in %s', to_dir)
+        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+    # returning the result
+    log.warn(egg)
+    if not os.path.exists(egg):
+        raise IOError('Could not build the egg.')
+
+
+class ContextualZipFile(zipfile.ZipFile):
+
+    """Supplement ZipFile class to support context manager for Python 2.6."""
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+    def __new__(cls, *args, **kwargs):
+        """Construct a ZipFile or ContextualZipFile as appropriate."""
+        if hasattr(zipfile.ZipFile, '__exit__'):
+            return zipfile.ZipFile(*args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls)
+
+
+@contextlib.contextmanager
+def archive_context(filename):
+    """
+    Unzip filename to a temporary directory, set to the cwd.
+
+    The unzipped target is cleaned up after.
+    """
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        _extractall(tar)
-        tar.close()
+        with ContextualZipFile(filename) as archive:
+            archive.extractall()
 
         # going in the directory
         subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
         os.chdir(subdir)
         log.warn('Now working in %s', subdir)
-
-        # building an egg
-        log.warn('Building a Setuptools egg in %s', to_dir)
-        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+        yield
 
     finally:
         os.chdir(old_wd)
         shutil.rmtree(tmpdir)
-    # returning the result
-    log.warn(egg)
-    if not os.path.exists(egg):
-        raise IOError('Could not build the egg.')
 
 
 def _do_download(version, download_base, to_dir, download_delay):
-    egg = os.path.join(to_dir, 'setuptools-%s-py%d.%d.egg'
-                       % (version, sys.version_info[0], sys.version_info[1]))
+    """Download Setuptools."""
+    py_desig = 'py{sys.version_info[0]}.{sys.version_info[1]}'.format(sys=sys)
+    tp = 'setuptools-{version}-{py_desig}.egg'
+    egg = os.path.join(to_dir, tp.format(**locals()))
     if not os.path.exists(egg):
-        tarball = download_setuptools(version, download_base,
-                                      to_dir, download_delay)
-        _build_egg(egg, tarball, to_dir)
+        archive = download_setuptools(version, download_base,
+            to_dir, download_delay)
+        _build_egg(egg, archive, to_dir)
     sys.path.insert(0, egg)
 
     # Remove previously-imported pkg_resources if present (see
     # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details).
     if 'pkg_resources' in sys.modules:
-        del sys.modules['pkg_resources']
+        _unload_pkg_resources()
 
     import setuptools
     setuptools.bootstrap_install_from = egg
 
 
-def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                   to_dir=os.curdir, download_delay=15):
+def use_setuptools(
+        version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+        to_dir=DEFAULT_SAVE_DIR, download_delay=15):
+    """
+    Ensure that a setuptools version is installed.
+
+    Return None. Raise SystemExit if the requested version
+    or later cannot be installed.
+    """
+    version = _resolve_version(version)
     to_dir = os.path.abspath(to_dir)
+
+    # prior to importing, capture the module state for
+    # representative modules.
     rep_modules = 'pkg_resources', 'setuptools'
     imported = set(sys.modules).intersection(rep_modules)
+
     try:
         import pkg_resources
-    except ImportError:
-        return _do_download(version, download_base, to_dir, download_delay)
-    try:
         pkg_resources.require("setuptools>=" + version)
+        # a suitable version is already installed
         return
+    except ImportError:
+        # pkg_resources not available; setuptools is not installed; download
+        pass
     except pkg_resources.DistributionNotFound:
-        return _do_download(version, download_base, to_dir, download_delay)
+        # no version of setuptools was found; allow download
+        pass
     except pkg_resources.VersionConflict as VC_err:
         if imported:
-            msg = textwrap.dedent("""
-                The required version of setuptools (>={version}) is not available,
-                and can't be installed while this script is running. Please
-                install a more recent version first, using
-                'easy_install -U setuptools'.
+            _conflict_bail(VC_err, version)
+
+        # otherwise, unload pkg_resources to allow the downloaded version to
+        #  take precedence.
+        del pkg_resources
+        _unload_pkg_resources()
+
+    return _do_download(version, download_base, to_dir, download_delay)
 
-                (Currently using {VC_err.args[0]!r})
-                """).format(VC_err=VC_err, version=version)
-            sys.stderr.write(msg)
-            sys.exit(2)
 
-        # otherwise, reload ok
-        del pkg_resources, sys.modules['pkg_resources']
-        return _do_download(version, download_base, to_dir, download_delay)
+def _conflict_bail(VC_err, version):
+    """
+    Setuptools was imported prior to invocation, so it is
+    unsafe to unload it. Bail out.
+    """
+    conflict_tmpl = textwrap.dedent("""
+        The required version of setuptools (>={version}) is not available,
+        and can't be installed while this script is running. Please
+        install a more recent version first, using
+        'easy_install -U setuptools'.
+
+        (Currently using {VC_err.args[0]!r})
+        """)
+    msg = conflict_tmpl.format(**locals())
+    sys.stderr.write(msg)
+    sys.exit(2)
+
+
+def _unload_pkg_resources():
+    sys.meta_path = [
+        importer
+        for importer in sys.meta_path
+        if importer.__class__.__module__ != 'pkg_resources.extern'
+    ]
+    del_modules = [
+        name for name in sys.modules
+        if name.startswith('pkg_resources')
+    ]
+    for mod_name in del_modules:
+        del sys.modules[mod_name]
+
 
 def _clean_check(cmd, target):
     """
-    Run the command to download target. If the command fails, clean up before
-    re-raising the error.
+    Run the command to download target.
+
+    If the command fails, clean up before re-raising the error.
     """
     try:
         subprocess.check_call(cmd)
@@ -158,115 +223,110 @@ def _clean_check(cmd, target):
             os.unlink(target)
         raise
 
+
 def download_file_powershell(url, target):
     """
-    Download the file at url to target using Powershell (which will validate
-    trust). Raise an exception if the command cannot complete.
+    Download the file at url to target using Powershell.
+
+    Powershell will validate trust.
+    Raise an exception if the command cannot complete.
     """
     target = os.path.abspath(target)
+    ps_cmd = (
+        "[System.Net.WebRequest]::DefaultWebProxy.Credentials = "
+        "[System.Net.CredentialCache]::DefaultCredentials; "
+        '(new-object System.Net.WebClient).DownloadFile("%(url)s", "%(target)s")'
+        % locals()
+    )
     cmd = [
         'powershell',
         '-Command',
-        "(new-object System.Net.WebClient).DownloadFile(%(url)r, %(target)r)" % vars(),
+        ps_cmd,
     ]
     _clean_check(cmd, target)
 
+
 def has_powershell():
+    """Determine if Powershell is available."""
     if platform.system() != 'Windows':
         return False
     cmd = ['powershell', '-Command', 'echo test']
-    devnull = open(os.path.devnull, 'wb')
-    try:
+    with open(os.path.devnull, 'wb') as devnull:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
+        except Exception:
             return False
-    finally:
-        devnull.close()
     return True
-
 download_file_powershell.viable = has_powershell
 
+
 def download_file_curl(url, target):
-    cmd = ['curl', url, '--silent', '--output', target]
+    cmd = ['curl', url, '--location', '--silent', '--output', target]
     _clean_check(cmd, target)
 
+
 def has_curl():
     cmd = ['curl', '--version']
-    devnull = open(os.path.devnull, 'wb')
-    try:
+    with open(os.path.devnull, 'wb') as devnull:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
+        except Exception:
             return False
-    finally:
-        devnull.close()
     return True
-
 download_file_curl.viable = has_curl
 
+
 def download_file_wget(url, target):
     cmd = ['wget', url, '--quiet', '--output-document', target]
     _clean_check(cmd, target)
 
+
 def has_wget():
     cmd = ['wget', '--version']
-    devnull = open(os.path.devnull, 'wb')
-    try:
+    with open(os.path.devnull, 'wb') as devnull:
         try:
             subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
-        except:
+        except Exception:
             return False
-    finally:
-        devnull.close()
     return True
-
 download_file_wget.viable = has_wget
 
+
 def download_file_insecure(url, target):
-    """
-    Use Python to download the file, even though it cannot authenticate the
-    connection.
-    """
+    """Use Python to download the file, without connection authentication."""
+    src = urlopen(url)
     try:
-        from urllib.request import urlopen
-    except ImportError:
-        from urllib2 import urlopen
-    src = dst = None
-    try:
-        src = urlopen(url)
-        # Read/write all in one block, so we don't create a corrupt file
-        # if the download is interrupted.
+        # Read all the data in one block.
         data = src.read()
-        dst = open(target, "wb")
-        dst.write(data)
     finally:
-        if src:
-            src.close()
-        if dst:
-            dst.close()
+        src.close()
 
+    # Write all the data in one block to avoid creating a partial file.
+    with open(target, "wb") as dst:
+        dst.write(data)
 download_file_insecure.viable = lambda: True
 
+
 def get_best_downloader():
-    downloaders = [
+    downloaders = (
         download_file_powershell,
         download_file_curl,
         download_file_wget,
         download_file_insecure,
-    ]
+    )
+    viable_downloaders = (dl for dl in downloaders if dl.viable())
+    return next(viable_downloaders, None)
 
-    for dl in downloaders:
-        if dl.viable():
-            return dl
 
-def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                        to_dir=os.curdir, delay=15,
-                        downloader_factory=get_best_downloader):
-    """Download setuptools from a specified location and return its filename
+def download_setuptools(
+        version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+        to_dir=DEFAULT_SAVE_DIR, delay=15,
+        downloader_factory=get_best_downloader):
+    """
+    Download setuptools from a specified location and return its filename.
 
     `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end
+    as an sdist for download under the `download_base` URL (which should end
     with a '/'). `to_dir` is the directory where the egg will be downloaded.
     `delay` is the number of seconds to pause before an actual download
     attempt.
@@ -274,11 +334,12 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     ``downloader_factory`` should be a function taking no arguments and
     returning a function for downloading a URL to a target.
     """
+    version = _resolve_version(version)
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
-    tgz_name = "setuptools-%s.tar.gz" % version
-    url = download_base + tgz_name
-    saveto = os.path.join(to_dir, tgz_name)
+    zip_name = "setuptools-%s.zip" % version
+    url = download_base + zip_name
+    saveto = os.path.join(to_dir, zip_name)
     if not os.path.exists(saveto):  # Avoid repeated downloads
         log.warn("Downloading %s", url)
         downloader = downloader_factory()
@@ -286,60 +347,42 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     return os.path.realpath(saveto)
... 2562 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-20-g8aa40a8

From: Oleg B. <no...@so...> - 2016-07-11 16:41:35

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  8aa40a8c3684059468b2ccf793dfe381033fd395 (commit)
      from  bd37317ac0b7f1a1f286acfa8c78bd7016285cfa (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/8aa40a8c3684059468b2ccf793dfe381033fd395

commit 8aa40a8c3684059468b2ccf793dfe381033fd395
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Jul 11 19:39:49 2016 +0300

    Document [ci skip]

diff --git a/docs/DeveloperGuide.txt b/docs/DeveloperGuide.txt
index 42b2a19..070c9e3 100644
--- a/docs/DeveloperGuide.txt
+++ b/docs/DeveloperGuide.txt
@@ -262,6 +262,11 @@ We now use Travis CI to run tests. See the status:
 .. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
   :target: https://travis-ci.org/sqlobject/sqlobject
 
+To avoid triggering unnecessary test run at Travis add text `[ci skip]
+<https://docs.travis-ci.com/user/customizing-the-build/#Skipping-a-build>`_
+anywhere in your commit messages for commits that don't change code
+(documentation updates and such).
+
 Documentation
 =============
 

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

Summary of changes:
 docs/DeveloperGuide.txt |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
SQLObject development repository

[SQL-CVS] SQLObject development repository branch master updated. 3.0.0-19-gbd37317

From: Oleg B. <no...@so...> - 2016-07-10 14:41:23

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  bd37317ac0b7f1a1f286acfa8c78bd7016285cfa (commit)
      from  217bbb8a7ece95f956dc3718c7d8bb0ddbb34155 (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/bd37317ac0b7f1a1f286acfa8c78bd7016285cfa

commit bd37317ac0b7f1a1f286acfa8c78bd7016285cfa
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Jul 10 17:39:25 2016 +0300

    Ignore flake8's F405
    
    Ignore F405 NAME may be undefined, or defined from star imports. We use
    start import a lot.

diff --git a/setup.cfg b/setup.cfg
index 5aef598..f058df0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,7 +13,8 @@ exclude = .git,docs/europython/*.py,ez_setup.py
 ; Ignore:
 ; E401 multiple imports on one line
 ; F403 'from module import *' used; unable to detect undefined names
-ignore = E401,F403
+; F405 NAME may be undefined, or defined from star imports
+ignore = E401,F403,F405
 
 [pudge]
 theme = pythonpaste.org

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

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


hooks/post-receive
-- 
SQLObject development repository

89 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 8 9 10 11 12 .. 192 > >> (Page 10 of 192)