|
From: Oleg B. <no...@so...> - 2022-09-20 16:52:05
|
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 1a0168e0b4c891c51b6255e1295111409bf98fc5 (commit)
via 656fa2f278ec521b5bf5526170b3616bc048e2cc (commit)
via abd02481adbab503e0787c0d32f5c86248cce543 (commit)
via 012da8ffa26f4b8419f19be8d00fdf544297725e (commit)
via b79929b1abfa4ccb96be0838adb5c6b7f7b5c88b (commit)
via 30ba31d4d49c212124d4994abc4b237cc2e57100 (commit)
via 4261d5a101b91697e5fea93c88223bc48f24ad40 (commit)
via 04da46e0d3773b80fa2db2021956b53c95574da8 (commit)
via 18dbbc65877e2adb451db69aec207d542f90733f (commit)
via b815441e42211f13586088c502831cabb2fd44b7 (commit)
via c38bed3e3ef61b7d30a250146db6515a51fc7f01 (commit)
via 6259596b1095a24daf5ba6eaeb36253e17661597 (commit)
via b0299a54f5cd611e1f8a9d1ddc214508f79504e9 (commit)
via 1e4019e1c117b359d6d39823468c48da14df096d (commit)
via 988e73e6aa311920dda0bb583b4778ba49991540 (commit)
via f1a3d33bba66bb888e9138df23b49264ea1f1268 (commit)
via 17bf01d0e15fb6bbb95a5777cac7c2f6236b4031 (commit)
via 0d8ba319dd141f617b3663ca353d77f83d834da5 (commit)
via 804dcee1a00dd168ff7fe7bb559b1c8b6f68e915 (commit)
via 6843aa173302384aebd69f7187b0b23551762927 (commit)
via 1c5ed87d699191c13a5754637f138c9db5656981 (commit)
via 4cb3e4e694dff3d582bce785a2e62489055479fa (commit)
via d2921ea11e634169b3cbeba3707fc6bd5f048d07 (commit)
via ec1b75d8e4dde24154ee972ce117c01cc247b372 (commit)
via 8cde480dfa2940ae1ea4626873627d7ed2d4f325 (commit)
via 50e50dc0c972ab80c6dc8f3ca64fe7c762cb73ed (commit)
via 71ba79e666a738d37cf1d57eb82e2be1b61a2c90 (commit)
via 1aed26838d1616b3686b74697e01bb4da5e47b79 (commit)
via 836763622ef5b93f933cbd712ef7b65cdb742183 (commit)
via 42a1f53a2368e4a53d0bef0227295d3fec9f4731 (commit)
via 576f82f00163ef041ff994f9ed9cca168300c835 (commit)
via 71da8511dd6ab1b45c2d2057849602b7d66a8435 (commit)
via 91057747751df3793898898903fb371709ccc1f8 (commit)
via 9f3ca7e00da3d820b7181a9988f82424b2439254 (commit)
via 18f55ff5894eeb33dc77d6318cf32f0d4341f661 (commit)
via 2a7d26086f73028fdb651f9e22e99c812b81b883 (commit)
via c3933b813383cc1b269b6c2564e89e3c7aa523e9 (commit)
from b74820a65dbbaa48064bc0f3d98091b1a3820a41 (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/1a0168e0b4c891c51b6255e1295111409bf98fc5
commit 1a0168e0b4c891c51b6255e1295111409bf98fc5
Author: Oleg Broytman <ph...@ph...>
Date: Tue Sep 20 19:40:58 2022 +0300
Release 3.10.0
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 5f6c2aa..cfec8c1 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,25 +1,54 @@
Hello!
-I'm pleased to announce version 3.9.2a1, the first alpha of the upcoming
-release of branch 3.9 of SQLObject.
+I'm pleased to announce version 3.10.0, the first release of branch
+3.10 of SQLObject.
-I'm pleased to announce version 3.9.2a2, the second alpha of the upcoming
-release of branch 3.9 of SQLObject.
-I'm pleased to announce version 3.9.2b1, the first beta of the upcoming
-release of branch 3.9 of SQLObject.
+What's new in SQLObject
+=======================
-I'm pleased to announce version 3.9.2rc1, the first release candidate
-of the upcoming release of branch 3.9 of SQLObject.
+Contributors for this release are
+James Hudson, Juergen Gmach, Hugo van Kemenade.
+Many thanks!
-I'm pleased to announce version 3.9.2, the first bugfix release of branch
-3.9 of SQLObject.
+Features
+--------
+* Allow connections in ``ConnectionHub`` to be strings.
+ This allows to open a new connection in every thread.
-What's new in SQLObject
-=======================
+* Add compatibility with ``Pendulum``.
+
+Tests
+-----
+
+* Run tests with Python 3.10.
+
+CI
+--
+
+* GitHub Actions.
+
+* Stop testing at Travis CI.
+
+* Stop testing at AppVeyor.
+
+Documentation
+-------------
+
+* DevGuide: source code must be pure ASCII.
+
+* DevGuide: ``reStructuredText`` format for docstrings is recommended.
+
+* DevGuide: de-facto good commit message format is required:
+ subject/body/trailers.
+
+* DevGuide: ``conventional commit`` format for commit message subject lines
+ is recommended.
+
+* DevGuide: ``Markdown`` format for commit message bodies is recommended.
-Contributors for this release are
+* DevGuide: commit messages must be pure ASCII.
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -52,7 +81,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.org/project/SQLObject/3.9.2a0.dev20210227/
+https://pypi.org/project/SQLObject/3.10.0
News and changes:
http://sqlobject.org/News.html
diff --git a/README.rst b/README.rst
index 2152854..92b1dd7 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-SQLObject 3.9.2a0
-=================
+SQLObject 3.10.0
+================
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/devscripts/build-all-docs b/devscripts/build-all-docs
index 8cb4ba1..8942edb 100755
--- a/devscripts/build-all-docs
+++ b/devscripts/build-all-docs
@@ -10,7 +10,7 @@ cd "`dirname \"$0\"`" &&
PROG_DIR="`pwd`" &&
cd .. &&
-build_docs 3.9.1 &&
+build_docs 3.10.0 &&
build_docs master devel &&
rm -rf docs/html &&
diff --git a/docs/News.rst b/docs/News.rst
index 6709089..12c0a78 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -5,8 +5,10 @@ News
.. contents:: Contents:
:backlinks: none
-SQLObject (master)
-==================
+SQLObject 3.10.0
+================
+
+Released 2022 Sep 20.
Features
--------
@@ -47,9 +49,6 @@ Documentation
* DevGuide: commit messages must be pure ASCII.
-* Change Travis CI URLs:
- CI relocated from travis-ci.org to travis-ci.com.
-
SQLObject 3.9.1
===============
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index cb43f08..e01c255 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,8 +1,8 @@
-version = '3.9.1'
+version = '3.10.0'
major = 3
-minor = 9
-micro = 1
+minor = 10
+micro = 0
release_level = 'final'
serial = 0
version_info = (major, minor, micro, release_level, serial)
http://sourceforge.net/p/sqlobject/sqlobject/ci/656fa2f278ec521b5bf5526170b3616bc048e2cc
commit 656fa2f278ec521b5bf5526170b3616bc048e2cc
Merge: 8cde480 abd0248
Author: Oleg Broytman <ph...@ph...>
Date: Tue Sep 20 19:29:08 2022 +0300
Merge branch 'github-actions'
http://sourceforge.net/p/sqlobject/sqlobject/ci/abd02481adbab503e0787c0d32f5c86248cce543
commit abd02481adbab503e0787c0d32f5c86248cce543
Author: Oleg Broytman <ph...@ph...>
Date: Sun Sep 18 20:28:28 2022 +0300
CI(GHActions): Show `tox`/`pytest` version
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 6bc5a27..edf0a59 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -64,6 +64,9 @@ jobs:
f.write('PGPASSWORD=test\n')
shell: python
+ - name: tox version
+ run: |
+ tox --version
- name: Run tox @ Linux
run: |
devscripts/tox-select-envs $PYVER-mysql
diff --git a/tox.ini b/tox.ini
index 60e6814..828cc91 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,7 @@ basepython =
commands =
{envpython} --version
{envpython} -c "import struct; print(struct.calcsize('P') * 8)"
+ {envpython} -m pytest --version
deps =
-rdevscripts/requirements/requirements_tests.txt
py34: pendulum < 2.1
@@ -370,6 +371,7 @@ commands = {[firebirdsql]commands}
changedir = ./
deps =
flake8
+ pytest < 7.0
commands =
{[testenv]commands}
flake8 .
http://sourceforge.net/p/sqlobject/sqlobject/ci/012da8ffa26f4b8419f19be8d00fdf544297725e
commit 012da8ffa26f4b8419f19be8d00fdf544297725e
Author: Oleg Broytman <ph...@ph...>
Date: Sat Sep 17 22:55:44 2022 +0300
CI(GHActions): Fix versions for newer Pythons
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index fe4b24d..6bc5a27 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -52,7 +52,7 @@ jobs:
- name: Install dependencies
run: |
python --version
- python -m pip install --upgrade "pip<21.0" "setuptools<45" wheel
+ python -m pip install --upgrade pip setuptools wheel
pip --version
pip install --upgrade virtualenv tox
- name: Set PYVER
diff --git a/tox.ini b/tox.ini
index 7b3ee57..60e6814 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,6 @@ commands =
{envpython} --version
{envpython} -c "import struct; print(struct.calcsize('P') * 8)"
deps =
- py27,py34: pip < 19.2
- py27,py34: setuptools < 44
-rdevscripts/requirements/requirements_tests.txt
py34: pendulum < 2.1
py34: zope.datetime < 4.3
@@ -45,7 +43,6 @@ deps =
firebirdsql: firebirdsql
passenv = CI
setenv =
- VIRTUALENV_PIP = 19.1.1
PGPASSWORD = test
# Don't fail or warn on uninstalled commands
platform = linux
http://sourceforge.net/p/sqlobject/sqlobject/ci/b79929b1abfa4ccb96be0838adb5c6b7f7b5c88b
commit b79929b1abfa4ccb96be0838adb5c6b7f7b5c88b
Author: Oleg Broytman <ph...@ph...>
Date: Fri Sep 16 23:27:28 2022 +0300
Feat(GHActions): Python 3.6-3.10
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index a00242e..fe4b24d 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -9,7 +9,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
- python-version: ["2.7", "3.5"]
+ python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
include:
- os: ubuntu-latest
os-name: Linux
diff --git a/devscripts/requirements/requirements_tests.txt b/devscripts/requirements/requirements_tests.txt
index 7367495..d6a5117 100644
--- a/devscripts/requirements/requirements_tests.txt
+++ b/devscripts/requirements/requirements_tests.txt
@@ -1,4 +1,8 @@
-r requirements.txt
pytest < 5.0; python_version == '2.7' or python_version == '3.4'
-pytest; python_version >= '3.5'
+
+# Pytest 7.0 introduced a major bug; see
+# https://github.com/pytest-dev/pytest/issues/9620
+
+pytest < 7.0; python_version >= '3.5'
http://sourceforge.net/p/sqlobject/sqlobject/ci/30ba31d4d49c212124d4994abc4b237cc2e57100
commit 30ba31d4d49c212124d4994abc4b237cc2e57100
Author: Oleg Broytman <ph...@ph...>
Date: Fri Sep 16 16:33:04 2022 +0300
Fix(mysql-connector): Convert bytearrays
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index 0a670f7..c4a72a6 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -480,10 +480,10 @@ class MySQLConnection(DBAPI):
return col.Col, {}
def listTables(self):
- return [v[0] for v in self.queryAll("SHOW TABLES")]
+ return _decodeBytearrays(self.queryAll("SHOW TABLES"))
def listDatabases(self):
- return [v[0] for v in self.queryAll("SHOW DATABASES")]
+ return _decodeBytearrays(self.queryAll("SHOW DATABASES"))
def _createOrDropDatabase(self, op="CREATE"):
self.query('%s DATABASE %s' % (op, self.db))
@@ -547,3 +547,11 @@ def ConnectorBytesConverter(value, db):
assert db == 'mysql'
value = value.decode('latin1')
return StringLikeConverter(value, db)
+
+
+def _decodeBytearrays(v_list):
+ if not v_list:
+ return []
+ if not PY2 and isinstance(v_list[0][0], bytearray):
+ return [v[0].decode('ascii') for v in v_list]
+ return [v[0] for v in v_list]
http://sourceforge.net/p/sqlobject/sqlobject/ci/4261d5a101b91697e5fea93c88223bc48f24ad40
commit 4261d5a101b91697e5fea93c88223bc48f24ad40
Author: Oleg Broytman <ph...@ph...>
Date: Thu Sep 15 22:29:50 2022 +0300
Fix(tox): Make `mysql-connector` connect as the local user
diff --git a/tox.ini b/tox.ini
index 37c39a6..7b3ee57 100644
--- a/tox.ini
+++ b/tox.ini
@@ -97,7 +97,7 @@ commands =
{[testenv]commands}
-mysql --execute="drop database sqlobject_test;"
mysql --execute="create database sqlobject_test;"
- pytest -D "mysql://localhost/sqlobject_test?driver=connector&charset=utf8&debug=1"
+ pytest -D "mysql://runner:@localhost/sqlobject_test?driver=connector&charset=utf8&debug=1"
mysql --execute="drop database sqlobject_test;"
[testenv:py27-mysql-connector]
http://sourceforge.net/p/sqlobject/sqlobject/ci/04da46e0d3773b80fa2db2021956b53c95574da8
commit 04da46e0d3773b80fa2db2021956b53c95574da8
Author: Oleg Broytman <ph...@ph...>
Date: Thu Sep 15 20:29:20 2022 +0300
Fix(tox): Skip `py27-mysqldb`
Old `MySQLdb` for Python 2.7 requires old MySQL,
it cannot be compiled with MySQL 8+.
diff --git a/tox.ini b/tox.ini
index eecaa8f..37c39a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -68,7 +68,7 @@ commands =
pytest -D "mysql://localhost/sqlobject_test?driver=mysqldb&debug=1"
mysql --execute="drop database sqlobject_test;"
-[testenv:py27-mysqldb]
+[testenv:py27-mysqldb-noauto]
commands =
easy_install -i https://downloads.egenix.com/python/index/ucs2/ egenix-mx-base
{[mysqldb]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/18dbbc65877e2adb451db69aec207d542f90733f
commit 18dbbc65877e2adb451db69aec207d542f90733f
Author: Oleg Broytman <ph...@ph...>
Date: Thu Sep 15 20:08:23 2022 +0300
Fix(mysql-connector): Fix dbName under Python 2
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index e1d74c8..0a670f7 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -542,7 +542,8 @@ class MySQLConnection(DBAPI):
def ConnectorBytesConverter(value, db):
- assert db == 'mysql'
if not PY2:
+ # For PY2 this converter is called also for SQLite
+ assert db == 'mysql'
value = value.decode('latin1')
return StringLikeConverter(value, db)
http://sourceforge.net/p/sqlobject/sqlobject/ci/b815441e42211f13586088c502831cabb2fd44b7
commit b815441e42211f13586088c502831cabb2fd44b7
Author: Oleg Broytman <ph...@ph...>
Date: Tue Apr 19 18:12:59 2022 +0300
CI(GHActions): MySQL
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index a2eacd0..a00242e 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -23,6 +23,9 @@ jobs:
steps:
+ # Setup MySQL
+ - uses: ankane/setup-mysql@v1
+
# Setup PostgreSQL
- uses: ankane/setup-postgres@v1
- name: Setup Postgres user
@@ -63,12 +66,14 @@ jobs:
- name: Run tox @ Linux
run: |
+ devscripts/tox-select-envs $PYVER-mysql
devscripts/tox-select-envs $PYVER-postgres
devscripts/tox-select-envs $PYVER-sqlite
devscripts/tox-select-envs $PYVER-flake8
if: ${{ runner.os == 'Linux' }}
- name: Run tox @ w64
run: |
+ devscripts\tox-select-envs.cmd %PYVER%-mysql
devscripts\tox-select-envs.cmd %PYVER%-postgres
devscripts\tox-select-envs.cmd %PYVER%-sqlite
if: ${{ runner.os == 'Windows' }}
diff --git a/tox.ini b/tox.ini
index 2dca2f1..eecaa8f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,10 +63,10 @@ whitelist_externals =
[mysqldb]
commands =
{[testenv]commands}
- -mysql --user=root --execute="drop database sqlobject_test;"
- mysql --user=root --execute="create database sqlobject_test;"
- pytest -D "mysql://root:@localhost/sqlobject_test?driver=mysqldb&debug=1"
- mysql --user=root --execute="drop database sqlobject_test;"
+ -mysql --execute="drop database sqlobject_test;"
+ mysql --execute="create database sqlobject_test;"
+ pytest -D "mysql://localhost/sqlobject_test?driver=mysqldb&debug=1"
+ mysql --execute="drop database sqlobject_test;"
[testenv:py27-mysqldb]
commands =
@@ -80,10 +80,10 @@ deps =
[mysqlclient]
... 2945 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
