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