[SQL-CVS] SQLObject development repository branch master updated. 3.12.0.post2-3-g64610cf

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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  64610cfa6d704c21a01fe699e5b1128743109940 (commit)
       via  35173138349b7274b1f4d01d8ccafee1d1983368 (commit)
       via  d13705e34c49158b2c23675958752b779165ba1d (commit)
       via  749f3c83307895ac556f1eb30e437a5c5a3e2f40 (commit)
       via  738920611f57aefb355d6551863eb3a3aba34a2b (commit)
       via  7f5284a05e1de651fdf99d90bdcaddfd10f68128 (commit)
       via  194151f2670321684e34bbfb7d77c501492725b5 (commit)
      from  500a70b21b62956202aeea8059e2a17889a2a919 (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/64610cfa6d704c21a01fe699e5b1128743109940

commit 64610cfa6d704c21a01fe699e5b1128743109940
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Jan 13 21:10:20 2025 +0300

    Feat(Pg): Extend default list of drivers
    
    The list is now `psycopg`, `psycopg2`, `pygresql`.

diff --git a/docs/News.rst b/docs/News.rst
index 01ca0ab..4de503a 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -24,6 +24,9 @@ Drivers
 * Extended default list of MySQL drivers to ``mysqldb``, ``mysqlclient``,
   ``mysql-connector``, ``mysql-connector-python``, ``pymysql``.
 
+* Extended default list of PostgreSQL drivers to ``psycopg``, ``psycopg2``,
+  ``pygresql``.
+
 SQLObject 3.12.0
 ================
 
diff --git a/docs/SQLObject.rst b/docs/SQLObject.rst
index 8f08941..9f46fa3 100644
--- a/docs/SQLObject.rst
+++ b/docs/SQLObject.rst
@@ -1852,7 +1852,7 @@ parameter in DB URI or PostgresConnection that can be a comma-separated
 list of driver names. Possible drivers are: ``psycopg``, ``psycopg2``,
 ``pygresql``, ``pypostgresql``, ``pg8000``,
 ``pyodbc``, ``pypyodbc`` or ``odbc`` (try ``pyodbc`` and
-``pypyodbc``). Default is ``psycopg``.
+``pypyodbc``). Default are ``psycopg``, ``psycopg2``, ``pygresql``.
 
 Connection-specific parameters are: ``sslmode``, ``unicodeCols``,
 ``schema``, ``charset``.
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index bb76afa..fb24f95 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -57,7 +57,7 @@ class PostgresConnection(DBAPI):
 
     def __init__(self, dsn=None, host=None, port=None, db=None,
                  user=None, password=None, **kw):
-        drivers = kw.pop('driver', None) or 'psycopg'
+        drivers = kw.pop('driver', None) or 'psycopg,psycopg2,pygresql'
         for driver in drivers.split(','):
             driver = driver.strip()
             if not driver:

http://sourceforge.net/p/sqlobject/sqlobject/ci/35173138349b7274b1f4d01d8ccafee1d1983368

commit 35173138349b7274b1f4d01d8ccafee1d1983368
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Jan 13 21:05:30 2025 +0300

    Feat(MySQL): Extend default list of drivers
    
    The list is now `mysqldb`, `mysqlclient`,
    `mysql-connector`, `mysql-connector-python`, `pymysql`.

diff --git a/docs/News.rst b/docs/News.rst
index 83a60ba..01ca0ab 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -18,6 +18,12 @@ Installation/dependencies
 
 * Use ``FormEncode`` 2.1.1 for Python 3.13.
 
+Drivers
+-------
+
+* Extended default list of MySQL drivers to ``mysqldb``, ``mysqlclient``,
+  ``mysql-connector``, ``mysql-connector-python``, ``pymysql``.
+
 SQLObject 3.12.0
 ================
 
diff --git a/docs/SQLObject.rst b/docs/SQLObject.rst
index c6bbd17..8f08941 100644
--- a/docs/SQLObject.rst
+++ b/docs/SQLObject.rst
@@ -1804,7 +1804,8 @@ define the backend using ``sqlmeta.createSQL``.
 
 Supported drivers are ``mysqldb``, ``connector``, ``pymysql``, ``cymysql``,
 ``mariadb``, ``pyodbc``, ``pypyodbc`` or ``odbc`` (try ``pyodbc`` and
-``pypyodbc``); defualt is ``mysqldb``.
+``pypyodbc``); default are ``mysqldb``, ``mysqlclient``,
+``mysql-connector``, ``mysql-connector-python``, ``pymysql``.
 
 
 Keyword argument ``conv`` allows to pass a list of custom converters.
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index 557adb9..8ba4a99 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -39,7 +39,8 @@ class MySQLConnection(DBAPI):
     odbc_keywords = ('Server', 'Port', 'UID', 'Password', 'Database')
 
     def __init__(self, db, user, password='', host='localhost', port=0, **kw):
-        drivers = kw.pop('driver', None) or 'mysqldb'
+        drivers = kw.pop('driver', None) or 'mysqldb,mysqlclient,' + \
+            'mysql-connector,mysql-connector-python,pymysql'
         for driver in drivers.split(','):
             driver = driver.strip().lower()
             if not driver:

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

commit d13705e34c49158b2c23675958752b779165ba1d
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Feb 1 22:18:34 2025 +0300

    Build: Prepare for the next release
    
    [skip ci]

diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index d0b2fc1..47a3734 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,16 +1,26 @@
 Hello!
 
-I'm pleased to announce version 3.12.0.post2, the second post-release
-of release 3.12.0 of branch 3.12 of SQLObject.
+I'm pleased to announce version 3.12.1a1, the first alpha of the upcoming
+release of branch 3.12 of SQLObject.
+
+I'm pleased to announce version 3.12.1a2, the second alpha of the upcoming
+release of branch 3.12 of SQLObject.
+
+I'm pleased to announce version 3.12.1b1, the first beta of the upcoming
+release of branch 3.12 of SQLObject.
+
+I'm pleased to announce version 3.12.1rc1, the first release candidate
+of the upcoming release of branch 3.12 of SQLObject.
+
+I'm pleased to announce version 3.12.1, the first bugfix release of branch
+3.12 of SQLObject.
 
 
 What's new in SQLObject
 =======================
 
-Installation/dependencies
--------------------------
+The contributors for this release are ... Thanks!
 
-* Use ``FormEncode`` 2.1.1 for Python 3.13.
 
 For a more complete list, please see the news:
 http://sqlobject.org/News.html
@@ -42,7 +52,7 @@ Site:
 http://sqlobject.org
 
 Download:
-https://pypi.org/project/SQLObject/3.12.0.post2
+https://pypi.org/project/SQLObject/3.12.1a0.dev20250201/
 
 News and changes:
 http://sqlobject.org/News.html
diff --git a/docs/News.rst b/docs/News.rst
index bc14736..83a60ba 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -5,6 +5,9 @@ News
 .. contents:: Contents:
    :backlinks: none
 
+SQLObject (development)
+=======================
+
 SQLObject 3.12.0.post2
 ======================
 
diff --git a/setup.cfg b/setup.cfg
index 43bae0f..461bc50 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,6 +4,11 @@ universal = 1
 [easy_install]
 optimize = 2
 
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
 [flake8]
 exclude = .git,.tox,docs/europython/*.py
 # E305: expected 2 blank lines after class or function definition, found 1
diff --git a/setup.py b/setup.py
index 48e7a9d..1eeb42c 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ and `GitHub <https://github.com/sqlobject>`_.
 """,  # noqa: E501 line too long
     long_description_content_type="text/x-rst",
     classifiers=[
-        "Development Status :: 5 - Production/Stable",
+        "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: "
         "GNU Library or Lesser General Public License (LGPL)",

http://sourceforge.net/p/sqlobject/sqlobject/ci/749f3c83307895ac556f1eb30e437a5c5a3e2f40

commit 749f3c83307895ac556f1eb30e437a5c5a3e2f40
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Feb 1 21:46:43 2025 +0300

    Release 3.12.0.post2

diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 8fb113f..d0b2fc1 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,26 +1,16 @@
 Hello!
 
-I'm pleased to announce version 3.12.1a1, the first alpha of the upcoming
-release of branch 3.12 of SQLObject.
-
-I'm pleased to announce version 3.12.1a2, the second alpha of the upcoming
-release of branch 3.12 of SQLObject.
-
-I'm pleased to announce version 3.12.1b1, the first beta of the upcoming
-release of branch 3.12 of SQLObject.
-
-I'm pleased to announce version 3.12.1rc1, the first release candidate
-of the upcoming release of branch 3.12 of SQLObject.
-
-I'm pleased to announce version 3.12.1, the first bugfix release of branch
-3.12 of SQLObject.
+I'm pleased to announce version 3.12.0.post2, the second post-release
+of release 3.12.0 of branch 3.12 of SQLObject.
 
 
 What's new in SQLObject
 =======================
 
-The contributors for this release are ... Thanks!
+Installation/dependencies
+-------------------------
 
+* Use ``FormEncode`` 2.1.1 for Python 3.13.
 
 For a more complete list, please see the news:
 http://sqlobject.org/News.html
@@ -52,7 +42,7 @@ Site:
 http://sqlobject.org
 
 Download:
-https://pypi.org/project/SQLObject/3.12.1a0.dev20241220/
+https://pypi.org/project/SQLObject/3.12.0.post2
 
 News and changes:
 http://sqlobject.org/News.html
diff --git a/README.rst b/README.rst
index 980aae8..1829efc 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-SQLObject 3.12.0
-================
+SQLObject 3.12.0.post2
+======================
 
 SQLObject is a free and open-source (LGPL) Python object-relational
 mapper.  Your database tables are described as classes, and rows are
diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs
index 648f2f1..8d508b2 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.12.0 &&
+build_docs 3.12.0.post2 &&
 build_docs master devel &&
 rm -rf docs/html &&
 
diff --git a/docs/News.rst b/docs/News.rst
index 95ed3c4..bc14736 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -5,8 +5,10 @@ News
 .. contents:: Contents:
    :backlinks: none
 
-SQLObject (master)
-==================
+SQLObject 3.12.0.post2
+======================
+
+Released 2025 Feb 01.
 
 Installation/dependencies
 -------------------------
diff --git a/setup.cfg b/setup.cfg
index 461bc50..43bae0f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,11 +4,6 @@ universal = 1
 [easy_install]
 optimize = 2
 
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-
 [flake8]
 exclude = .git,.tox,docs/europython/*.py
 # E305: expected 2 blank lines after class or function definition, found 1
diff --git a/setup.py b/setup.py
index 1eeb42c..48e7a9d 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ and `GitHub <https://github.com/sqlobject>`_.
 """,  # noqa: E501 line too long
     long_description_content_type="text/x-rst",
     classifiers=[
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: "
         "GNU Library or Lesser General Public License (LGPL)",
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index 767a40e..9a310a1 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,8 +1,8 @@
 
-version = '3.12.0'
+version = '3.12.0.post2'
 major = 3
 minor = 12
 micro = 0
-release_level = 'final'
-serial = 0
+release_level = 'post'
+serial = 2
 version_info = (major, minor, micro, release_level, serial)

http://sourceforge.net/p/sqlobject/sqlobject/ci/738920611f57aefb355d6551863eb3a3aba34a2b

commit 738920611f57aefb355d6551863eb3a3aba34a2b
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Feb 1 21:17:42 2025 +0300

    Build(requirements): Use `FormEncode` 2.1.1 for Python 3.13

diff --git a/devscripts/requirements/requirements.txt b/devscripts/requirements/requirements.txt
index ce36de2..0283399 100644
--- a/devscripts/requirements/requirements.txt
+++ b/devscripts/requirements/requirements.txt
@@ -2,7 +2,7 @@
 DateTime
 
 FormEncode >= 1.1.1, != 1.3.0; python_version == '2.7'
-FormEncode >= 1.3.1; python_version >= '3.4' and python_version < '3.13'
-git+https://github.com/formencode/formencode.git; python_version >= '3.13'
+FormEncode >= 1.3.1; python_version >= '3.4'
+FormEncode >= 2.1.1; python_version >= '3.13'
 
 PyDispatcher >= 2.0.4
diff --git a/docs/News.rst b/docs/News.rst
index 030a651..95ed3c4 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -8,6 +8,11 @@ News
 SQLObject (master)
 ==================
 
+Installation/dependencies
+-------------------------
+
+* Use ``FormEncode`` 2.1.1 for Python 3.13.
+
 SQLObject 3.12.0
 ================
 
diff --git a/setup.py b/setup.py
index 9f5bea0..1eeb42c 100755
--- a/setup.py
+++ b/setup.py
@@ -104,11 +104,9 @@ and `GitHub <https://github.com/sqlobject>`_.
     requires=['FormEncode', 'PyDispatcher'],
     install_requires=[
         "FormEncode>=1.1.1,!=1.3.0; python_version=='2.7'",
-        "FormEncode>=1.3.1; python_version>='3.4' and python_version < '3.13'",
+        "FormEncode>=1.3.1; python_version>='3.4'",
+        "FormEncode>=2.1.1; python_version >= '3.13'",
         "PyDispatcher>=2.0.4",
-        "formencode @ "
-        "git+https://github.com/formencode/formencode.git#egg=formencode"
-        " ; python_version >= '3.13'",
     ],
     extras_require={
         # Firebird/Interbase

http://sourceforge.net/p/sqlobject/sqlobject/ci/7f5284a05e1de651fdf99d90bdcaddfd10f68128

commit 7f5284a05e1de651fdf99d90bdcaddfd10f68128
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Jan 14 00:20:58 2025 +0300

    Tests(tox): Change syntax for `envlist`
    
    `[testenv:]` doesn't allow lists like `[testenv:py27,py3{4,5}]`;
    it only allows syntax like `[testenv:py{27,34,35}]`.
    This commit changes syntax for `envlist` to make it closer to `[testenv:]`.

diff --git a/tox.ini b/tox.ini
index 82b39a4..a0df8f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.15
-envlist = py27,py3{4,5,6,7,8,9,10,11,12,13}-sqlite{,-memory},py{27,37,312}-flake8
+envlist = py{27,34,35,36,37,38,39,310,311,312,313}-sqlite{,-memory},py{27,37,312}-flake8
 
 # Base test environment settings
 [testenv]

http://sourceforge.net/p/sqlobject/sqlobject/ci/194151f2670321684e34bbfb7d77c501492725b5

commit 194151f2670321684e34bbfb7d77c501492725b5
Author: Oleg Broytman <ph...@ph...>
Date:   Mon Jan 13 19:29:22 2025 +0300

    CI(GHActions): Upgrade `setup-python` and `cache` actions

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index e61a0c4..1611929 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -49,16 +49,16 @@ jobs:
           miniforge-version: latest
           python-version: ${{ matrix.python-version }}
         if: ${{ !contains(fromJSON(env.not_in_conda), matrix.python-version) }}
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
         if: ${{ contains(fromJSON(env.not_in_conda), matrix.python-version) }}
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/conda_pkgs_dir
           key: ${{ runner.os }}-conda
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ matrix.pip-cache-path }}
           key: ${{ runner.os }}-pip

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

Summary of changes:
 .github/workflows/run-tests.yaml         |  6 +++---
 ANNOUNCE.rst                             |  2 +-
 README.rst                               |  4 ++--
 devscripts/build-all-docs                |  2 +-
 devscripts/requirements/requirements.txt |  4 ++--
 docs/News.rst                            | 23 +++++++++++++++++++++--
 docs/SQLObject.rst                       |  5 +++--
 setup.py                                 |  6 ++----
 sqlobject/__version__.py                 |  6 +++---
 sqlobject/mysql/mysqlconnection.py       |  3 ++-
 sqlobject/postgres/pgconnection.py       |  2 +-
 tox.ini                                  |  2 +-
 12 files changed, 42 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
SQLObject development repository




[SQL-CVS] SQLObject development repository branch master updated. 3.12.0.post2-3-g64610cf

SQLObject is a Python ORM.

[SQL-CVS] SQLObject development repository branch master updated. 3.12.0.post2-3-g64610cf