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 0d612ecb5e3f367a7734636d31cd2e80d1edd27e (commit)
via 6a4df62a61757f64c452359a57ff956bac6f452d (commit)
via f4741f8e03171883554319c6d7d59a26dedd1762 (commit)
via 87757d537df98bb7fb9b40e6f402266ef39b2c7e (commit)
via 924c868a16fde2c2d31609c3c26d4d49052ef0a0 (commit)
via b21d76a239533d8b126b4ceb162dfb7c04fee60b (commit)
via 661f41c795e020ffea9d16df0e340d54c73974c1 (commit)
via 6624e0a319fb81e11a586cb5ac2f8fd5c4b95b27 (commit)
via 84a4595b6a3f881979fb2d1a8ee39196fca08243 (commit)
via 51387761fa25f7d41916a3876753ef86ad4f4d7f (commit)
via 48e7eac934099caec2d7f3a0b86ff2badb000ec4 (commit)
via 1f50e64d9fa6cd96843cdbf3901c0517a075cfe6 (commit)
from df7ad69dca4d25021b0f07f90aac075b38d20227 (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/0d612ecb5e3f367a7734636d31cd2e80d1edd27e
commit 0d612ecb5e3f367a7734636d31cd2e80d1edd27e
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 5 10:47:59 2021 +0300
Build: Remove personal script `setup`
[skip ci]
diff --git a/devscripts/setup b/devscripts/setup
deleted file mode 100755
index e28d676..0000000
--- a/devscripts/setup
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-umask 022 # -rwxr-xr-x
-cd "`dirname \"$0\"`"/.. &&
-
-for py_ver in 2.7 3.4 3.5 3.6 3.7 3.8 3.9; do
- python$py_ver -m pip install --install-option=-O2 --upgrade .
-done &&
-
-exec rm -rf build dist SQLObject.egg-info MANIFEST *.egg
http://sourceforge.net/p/sqlobject/sqlobject/ci/6a4df62a61757f64c452359a57ff956bac6f452d
commit 6a4df62a61757f64c452359a57ff956bac6f452d
Author: Oleg Broytman <ph...@ph...>
Date: Sun Oct 3 17:52:17 2021 +0300
Build(devscripts): `rsync -a<anything>` -> `rsync -ahPv`
Especially remove option `-4`.
[skip ci]
diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs
index 34aacd3..8cb4ba1 100755
--- a/devscripts/build-all-docs
+++ b/devscripts/build-all-docs
@@ -3,7 +3,7 @@
build_docs() {
git checkout "$1" &&
devscripts/build-docs &&
- rsync -ahP --del --exclude=/robots.txt docs/html/ ../SQLObject-docs/"$2"/
+ rsync -ahPv --del --exclude=/robots.txt docs/html/ ../SQLObject-docs/"$2"/
}
cd "`dirname \"$0\"`" &&
diff --git a/devscripts/release b/devscripts/release
index 33bb23f..3873ec2 100755
--- a/devscripts/release
+++ b/devscripts/release
@@ -19,8 +19,8 @@ version=`python setup.py --version`
split_tag $version
if [ "$state" = final ]; then
- rsync -ahP4 dist/* frs.sourceforge.net:/home/frs/project/sqlobject/sqlobject/"$version"/ &&
- rsync -ahP4 ANNOUNCE.rst frs.sourceforge.net:/home/frs/project/sqlobject/sqlobject/"$version"/README.rst || exit 1
+ rsync -ahPv dist/* frs.sourceforge.net:/home/frs/project/sqlobject/sqlobject/"$version"/ &&
+ rsync -ahPv ANNOUNCE.rst frs.sourceforge.net:/home/frs/project/sqlobject/sqlobject/"$version"/README.rst || exit 1
devscripts/sftp-frs
fi &&
diff --git a/docs/rebuild b/docs/rebuild
index 1270384..4798a23 100755
--- a/docs/rebuild
+++ b/docs/rebuild
@@ -2,4 +2,4 @@
PYTHONPATH=.. make html &&
find . -name \*.tmp -type f -delete &&
-exec rsync -ahP --del --exclude=.buildinfo --exclude=objects.inv _build/html .
+exec rsync -ahPv --del --exclude=.buildinfo --exclude=objects.inv _build/html .
http://sourceforge.net/p/sqlobject/sqlobject/ci/f4741f8e03171883554319c6d7d59a26dedd1762
commit f4741f8e03171883554319c6d7d59a26dedd1762
Author: Oleg Broytman <ph...@ph...>
Date: Sun Jul 25 19:54:28 2021 +0300
Tests(tox): Limit `pip` and `setuptools` versions for Python 3.4
diff --git a/tox.ini b/tox.ini
index 64e08bd..88febe6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,8 @@ commands =
{envpython} --version
{envpython} -c "import struct; print(struct.calcsize('P') * 8)"
deps =
+ pip < 19.2
+ setuptools < 44
-rdevscripts/requirements/requirements_tests.txt
py34: pendulum < 2.1
py34: zope.datetime < 4.3
http://sourceforge.net/p/sqlobject/sqlobject/ci/87757d537df98bb7fb9b40e6f402266ef39b2c7e
commit 87757d537df98bb7fb9b40e6f402266ef39b2c7e
Author: Oleg Broytman <ph...@ph...>
Date: Sun Jul 25 14:49:55 2021 +0300
Tests(tox): Limit `VIRTUALENV_PIP` version for Python 3.4
diff --git a/tox.ini b/tox.ini
index c03d56c..64e08bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,6 +40,8 @@ deps =
firebird-fdb: fdb
firebirdsql: firebirdsql
passenv = CI TRAVIS TRAVIS_* APPVEYOR DISTUTILS_USE_SDK MSSdk INCLUDE LIB PGPASSWORD WINDIR
+setenv =
+ VIRTUALENV_PIP = 19.1.1
# Don't fail or warn on uninstalled commands
platform = linux
whitelist_externals =
http://sourceforge.net/p/sqlobject/sqlobject/ci/924c868a16fde2c2d31609c3c26d4d49052ef0a0
commit 924c868a16fde2c2d31609c3c26d4d49052ef0a0
Author: Oleg Broytman <ph...@ph...>
Date: Mon Jul 19 00:32:56 2021 +0300
Docs: Change Travis CI URLs
CI relocated from travis-ci.org to travis-ci.com.
[skip ci]
diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
index 966c379..4ac9556 100644
--- a/docs/DeveloperGuide.rst
+++ b/docs/DeveloperGuide.rst
@@ -272,8 +272,8 @@ exercised, even if the tests are absolutely complete.
We now use Travis CI and AppVeyor 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://api.travis-ci.com/sqlobject/sqlobject.svg?branch=master
+ :target: https://travis-ci.com/github/sqlobject/sqlobject
.. image:: https://ci.appveyor.com/api/projects/status/github/sqlobject/sqlobject?branch=master
:target: https://ci.appveyor.com/project/phdru/sqlobject
diff --git a/docs/News.rst b/docs/News.rst
index 96cc7f7..af6b8a7 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -13,6 +13,12 @@ Features
* Add compatibility with ``Pendulum``.
+Documentation
+-------------
+
+* Change Travis CI URLs:
+ CI relocated from travis-ci.org to travis-ci.com.
+
SQLObject 3.9.1
===============
diff --git a/setup.py b/setup.py
index 3dfd2ca..c7f59f2 100755
--- a/setup.py
+++ b/setup.py
@@ -42,8 +42,8 @@ For development see the projects at
`SourceForge <https://sourceforge.net/projects/sqlobject/>`_
and `GitHub <https://github.com/sqlobject>`_.
-.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
- :target: https://travis-ci.org/sqlobject/sqlobject
+.. image:: https://api.travis-ci.com/sqlobject/sqlobject.svg?branch=master
+ :target: https://travis-ci.com/github/sqlobject/sqlobject
""",
long_description_content_type="text/x-rst",
classifiers=[
http://sourceforge.net/p/sqlobject/sqlobject/ci/b21d76a239533d8b126b4ceb162dfb7c04fee60b
commit b21d76a239533d8b126b4ceb162dfb7c04fee60b
Merge: 5138776 661f41c
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jun 4 19:57:47 2021 +0300
Merge branch 'pr/169': Add compatibility with Pendulum #169
diff --cc tox.ini
index 28717e6,158c18c..c03d56c
--- a/tox.ini
+++ b/tox.ini
@@@ -19,8 -19,8 +19,10 @@@ commands
{envpython} -c "import struct; print(struct.calcsize('P') * 8)"
deps =
-rdevscripts/requirements/requirements_tests.txt
+ py34: pendulum < 2.1
+ py34: zope.datetime < 4.3
+ !py34: pendulum
+ !py34: zope.datetime
mysqldb: mysql-python
mysqlclient: mysqlclient
mysql-connector: mysql-connector <= 2.2.2
http://sourceforge.net/p/sqlobject/sqlobject/ci/661f41c795e020ffea9d16df0e340d54c73974c1
commit 661f41c795e020ffea9d16df0e340d54c73974c1
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jun 4 19:32:04 2021 +0300
Tests(test_datetime): Fix `test_PendulumDateTime`
Reset `default_datetime_implementation` back to `datetime`.
diff --git a/sqlobject/tests/test_datetime.py b/sqlobject/tests/test_datetime.py
index 21ed5a6..b40e4dd 100644
--- a/sqlobject/tests/test_datetime.py
+++ b/sqlobject/tests/test_datetime.py
@@ -131,6 +131,7 @@ if mxdatetime_available:
assert dt2.col3.second == int(_now.second)
if pendulumDateTimeType:
+ col.default_datetime_implementation = DATETIME_IMPLEMENTATION
import pendulum
class DateTimePendulum(SQLObject):
http://sourceforge.net/p/sqlobject/sqlobject/ci/6624e0a319fb81e11a586cb5ac2f8fd5c4b95b27
commit 6624e0a319fb81e11a586cb5ac2f8fd5c4b95b27
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jun 4 19:27:58 2021 +0300
Tests(tox): Install `pendulum` for new test in `test_datetime`
diff --git a/tox.ini b/tox.ini
index 67765a3..158c18c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,8 @@ commands =
{envpython} -c "import struct; print(struct.calcsize('P') * 8)"
deps =
-rdevscripts/requirements/requirements_tests.txt
+ py34: pendulum < 2.1
+ !py34: pendulum
mysqldb: mysql-python
mysqlclient: mysqlclient
mysql-connector: mysql-connector <= 2.2.2
http://sourceforge.net/p/sqlobject/sqlobject/ci/84a4595b6a3f881979fb2d1a8ee39196fca08243
commit 84a4595b6a3f881979fb2d1a8ee39196fca08243
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jun 4 19:25:48 2021 +0300
Docs: Add compatibility with `Pendulum`
Authors: Add James Hudson.
[skip ci]
diff --git a/docs/Authors.rst b/docs/Authors.rst
index 9f1c6fe..5ac9144 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -37,6 +37,7 @@ Contributions have been made by:
* Michael S. Root <miker at tippett.com>
* Scott Stahl <sstahl at onshift.com>
* Markus Elfring <elfring at users.sourceforge.net>
+* James Hudson <james.hudson at boughtbymany.com>
* Oleg Broytman <ph...@ph...>
.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
diff --git a/docs/News.rst b/docs/News.rst
index 37935f3..96cc7f7 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -8,6 +8,11 @@ News
SQLObject (master)
==================
+Features
+--------
+
+* Add compatibility with ``Pendulum``.
+
SQLObject 3.9.1
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/51387761fa25f7d41916a3876753ef86ad4f4d7f
commit 51387761fa25f7d41916a3876753ef86ad4f4d7f
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jun 4 19:16:26 2021 +0300
Tests(tox): Install `zope.datetime`
diff --git a/tox.ini b/tox.ini
index 67765a3..28717e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,8 @@ commands =
{envpython} -c "import struct; print(struct.calcsize('P') * 8)"
deps =
-rdevscripts/requirements/requirements_tests.txt
+ py34: zope.datetime < 4.3
+ !py34: zope.datetime
mysqldb: mysql-python
mysqlclient: mysqlclient
mysql-connector: mysql-connector <= 2.2.2
http://sourceforge.net/p/sqlobject/sqlobject/ci/48e7eac934099caec2d7f3a0b86ff2badb000ec4
commit 48e7eac934099caec2d7f3a0b86ff2badb000ec4
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jun 4 19:13:02 2021 +0300
CI: Downgrade `pip` to `<19.2` for Python 3.4 compatibility
diff --git a/.travis.yml b/.travis.yml
index 638d648..adcd77a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -127,7 +127,7 @@ before_install:
sudo chmod 644 /var/lib/firebird/create_test_db
fi
-install: travis_retry pip install --upgrade "pip<21" "setuptools<44" "tox>=3.15" coveralls codecov ppu
+install: travis_retry pip install --upgrade "pip<19.2" "setuptools<44" "tox>=3.15" coveralls codecov ppu
script: devscripts/tox-select-envs $TESTS
diff --git a/appveyor.yml b/appveyor.yml
index 38a7a1e..808f440 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -124,7 +124,7 @@ install:
- "SET TOXPYTHON=%PYTHON_HOME%\\python.exe"
- "python --version"
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
- - "python -m pip install --upgrade \"pip<21\" \"setuptools<44\""
+ - "python -m pip install --upgrade \"pip<19.2\" \"setuptools<44\""
- "pip install --upgrade \"tox>=3.15\" ppu"
- "pip --version"
# List ODBC drivers
http://sourceforge.net/p/sqlobject/sqlobject/ci/1f50e64d9fa6cd96843cdbf3901c0517a075cfe6
commit 1f50e64d9fa6cd96843cdbf3901c0517a075cfe6
Author: James Hudson <jam...@bo...>
Date: Thu Jun 3 16:23:41 2021 +0100
Add new converter for pendulum.DateTime
diff --git a/sqlobject/converters.py b/sqlobject/converters.py
index fa6ea1c..667fdde 100644
--- a/sqlobject/converters.py
+++ b/sqlobject/converters.py
@@ -22,6 +22,13 @@ except ImportError:
mxDateTimeType = None
mxDateTimeDeltaType = None
+try:
+ import pendulum
+except ImportError:
+ pendulumDateTimeType = None
+else:
+ pendulumDateTimeType = pendulum.DateTime
+
try:
from DateTime import DateTime as zopeDateTime
except ImportError:
@@ -215,6 +222,13 @@ if mxDateTimeType:
registerConverter(mxDateTimeDeltaType, mxTimeConverter)
+if pendulumDateTimeType:
+ def pendulumConverter(value, db):
+ return "'%s'" % value.to_datetime_string()
+
+ registerConverter(pendulum.DateTime, pendulumConverter)
+
+
if zopeDateTimeType:
def zopeDateTimeConverter(value, db):
return "'%s'" % value.strftime("%Y-%m-%d %H:%M:%S")
diff --git a/sqlobject/tests/test_datetime.py b/sqlobject/tests/test_datetime.py
index 06ce1ae..21ed5a6 100644
--- a/sqlobject/tests/test_datetime.py
+++ b/sqlobject/tests/test_datetime.py
@@ -7,7 +7,7 @@ from sqlobject.col import DateCol, DateTimeCol, TimeCol, use_microseconds, \
DATETIME_IMPLEMENTATION, MXDATETIME_IMPLEMENTATION, mxdatetime_available, \
ZOPE_DATETIME_IMPLEMENTATION, zope_datetime_available
from sqlobject.tests.dbtest import getConnection, setupClass
-
+from sqlobject.converters import pendulumDateTimeType
########################################
# Date/time columns
@@ -130,6 +130,26 @@ if mxdatetime_available:
assert dt2.col3.minute == _now.minute
assert dt2.col3.second == int(_now.second)
+if pendulumDateTimeType:
+ import pendulum
+
+ class DateTimePendulum(SQLObject):
+ col1 = DateTimeCol()
+
+ def test_PendulumDateTime():
+ setupClass(DateTimePendulum)
+ _now = pendulum.now()
+ dtp = DateTimePendulum(col1=_now)
+
+ assert isinstance(dtp.col1, datetime)
+ assert dtp.col1.year == _now.year
+ assert dtp.col1.month == _now.month
+ assert dtp.col1.day == _now.day
+ assert dtp.col1.hour == _now.hour
+ assert dtp.col1.minute == _now.minute
+ assert int(dtp.col1.second) == int(_now.second)
+
+
if zope_datetime_available:
col.default_datetime_implementation = ZOPE_DATETIME_IMPLEMENTATION
from DateTime import DateTime as zopeDateTime
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 2 +-
appveyor.yml | 2 +-
devscripts/build-all-docs | 2 +-
devscripts/release | 4 ++--
devscripts/setup | 10 ----------
docs/Authors.rst | 1 +
docs/DeveloperGuide.rst | 4 ++--
docs/News.rst | 11 +++++++++++
docs/rebuild | 2 +-
setup.py | 4 ++--
sqlobject/converters.py | 14 ++++++++++++++
sqlobject/tests/test_datetime.py | 23 ++++++++++++++++++++++-
tox.ini | 8 ++++++++
13 files changed, 66 insertions(+), 21 deletions(-)
delete mode 100755 devscripts/setup
hooks/post-receive
--
SQLObject development repository
|