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