[SQL-CVS] SQLObject development repository branch master updated. 3.13.1b1-1-ge9561de

[phd <no...@so...>]

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  e9561de92bdd8c2fd2b30ed19905dc49ff12f918 (commit)
       via  ebd8e4e85510ba8dcea94f8ef320cc95ec770f4d (commit)
       via  69e9604b7906a53ca4771e2b0d6da2d1da2f48ed (commit)
       via  db991816a85a704e4b8edf6978561c1f248a5388 (commit)
       via  21243137a981eaac7bba32135f183f9e696f5315 (commit)
       via  5f9b61c58dd1d50f7f2871a833843256bf5f4f65 (commit)
       via  806c0a919a14a86997c0c4fec1237fdb5914505d (commit)
       via  1fd8272fd8861ed7b7d9011d11720d417216f30b (commit)
       via  cc5e39ec0e13f01b466463c246a5fe73d64392cb (commit)
       via  caa7098b471dfefa8f64eef1e61fc334676ee2e5 (commit)
       via  deda3a4f7d0ef8253540b8fb6688a62a22ee448f (commit)
       via  04b36e4fb0a10bbe2876faf14db3ef3ea1d4d1de (commit)
       via  4d949f49e3f45958e3166154b6a9a74813919fc1 (commit)
       via  1909f2109fd0ffdb7ae59b98b120902b38a37b2a (commit)
       via  a6210a6e123140380312415d0efefd2a5e19d91a (commit)
      from  57839aa1eac3ed43a5626b5d2109a4756586b194 (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/e9561de92bdd8c2fd2b30ed19905dc49ff12f918

commit e9561de92bdd8c2fd2b30ed19905dc49ff12f918
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Nov 23 14:41:43 2025 +0300

    Build: Prepare for the next release
    
    [skip ci]

diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 18ed7f4..9220969 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,7 +1,7 @@
 Hello!
 
-I'm pleased to announce version 3.13.1b1, the first beta of the upcoming
-bugfix release 3.13.1 of SQLObject.
+I'm pleased to announce version 3.13.1, the first bugfix of the
+branch 3.13 of SQLObject.
 
 
 What's new in SQLObject
@@ -49,7 +49,7 @@ Site:
 http://sqlobject.org
 
 Download:
-https://pypi.org/project/SQLObject/3.13.1a0.dev20250307/
+https://pypi.org/project/SQLObject/3.13.1a0.dev20251124/
 
 News and changes:
 http://sqlobject.org/News.html
diff --git a/README.rst b/README.rst
index 840351f..157519a 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-SQLObject 3.13.1b1
-==================
+SQLObject 3.13.1
+================
 
 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/setup.py b/setup.py
index 22fbd0e..9158ff5 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 :: 4 - Beta",
+        "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/ebd8e4e85510ba8dcea94f8ef320cc95ec770f4d

commit ebd8e4e85510ba8dcea94f8ef320cc95ec770f4d
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Nov 23 14:33:38 2025 +0300

    Build: Evil PyPI enforces lower-case distribution names
    
    Rename the distribution to `sqlobject`.

diff --git a/devscripts/release b/devscripts/release
index 2df10e0..664b68b 100755
--- a/devscripts/release
+++ b/devscripts/release
@@ -24,15 +24,5 @@ if [ "$state" = final ]; then
    devscripts/sftp-frs
 fi &&
 
-cd dist &&
-if [ -f SQLObject-$version.tar.gz ]; then
-    mv SQLObject-$version.tar.gz sqlobject-$version.tar.gz
-fi &&
-if [ -f SQLObject-$version-py2.py3-none-any.whl ]; then
-    mv SQLObject-$version-py2.py3-none-any.whl \
-       sqlobject-$version-py2.py3-none-any.whl
-fi &&
-cd .. &&
-
 twine upload --disable-progress-bar --skip-existing dist/* &&
-exec rm -rf build dist docs/html SQLObject.egg-info
+exec rm -rf build dist docs/html sqlobject.egg-info
diff --git a/setup.py b/setup.py
index 1a9d772..22fbd0e 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ subpackages = ['firebird', 'include', 'include.tests',
                'versioning', 'versioning.test']
 
 setup(
-    name="SQLObject",
+    name="sqlobject",
     version=sqlobject_version['version'],
     description="Object-Relational Manager, aka database wrapper",
     long_description="""\
@@ -75,12 +75,12 @@ and `GitHub <https://github.com/sqlobject>`_.
     maintainer="Oleg Broytman",
     maintainer_email="ph...@ph...",
     url="http://sqlobject.org/",
-    download_url="https://pypi.org/project/SQLObject/%s/" %
+    download_url="https://pypi.org/project/sqlobject/%s/" %
     sqlobject_version['version'],
     project_urls={
         'Homepage': 'http://sqlobject.org/',
         'Development docs': 'http://sqlobject.org/devel/',
-        'Download': 'https://pypi.org/project/SQLObject/%s/' %
+        'Download': 'https://pypi.org/project/sqlobject/%s/' %
         sqlobject_version['version'],
         'Github repo': 'https://github.com/sqlobject',
         'Issue tracker': 'https://github.com/sqlobject/sqlobject/issues',
@@ -213,7 +213,7 @@ Mailing list:
 https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
 
 Download:
-https://pypi.org/project/SQLObject/@@/
+https://pypi.org/project/sqlobject/@@/
 
 News and changes:
 http://sqlobject.org/docs/News.html

http://sourceforge.net/p/sqlobject/sqlobject/ci/69e9604b7906a53ca4771e2b0d6da2d1da2f48ed

commit 69e9604b7906a53ca4771e2b0d6da2d1da2f48ed
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Nov 23 14:22:14 2025 +0300

    Release 3.13.1b1

diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index ad13b0f..18ed7f4 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,22 +1,7 @@
 Hello!
 
-I'm pleased to announce version 3.13.1a1, the first alpha of the upcoming
-release of branch 3.13 of SQLObject.
-
-I'm pleased to announce version 3.13.1a2, the second alpha of the upcoming
-release of branch 3.13 of SQLObject.
-
 I'm pleased to announce version 3.13.1b1, the first beta of the upcoming
-release of branch 3.13 of SQLObject.
-
-I'm pleased to announce version 3.13.1rc1, the first release candidate
-of the upcoming release of branch 3.13 of SQLObject.
-
-I'm pleased to announce version 3.13.1, the first bugfix release of branch
-3.13 of SQLObject.
-
-I'm pleased to announce version 3.13.0, the first release of branch
-3.13 of SQLObject.
+bugfix release 3.13.1 of SQLObject.
 
 
 What's new in SQLObject
diff --git a/README.rst b/README.rst
index 4e7af74..840351f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-SQLObject 3.13.0
-================
+SQLObject 3.13.1b1
+==================
 
 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/setup.py b/setup.py
index 02b384c..1a9d772 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 :: 4 - Beta",
         "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 cc6e4c5..44d9bc7 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,8 +1,8 @@
 
-version = '3.13.0'
+version = '3.13.1b1'
 major = 3
 minor = 13
-micro = 0
-release_level = 'final'
-serial = 0
+micro = 1
+release_level = 'beta'
+serial = 1
 version_info = (major, minor, micro, release_level, serial)

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

commit db991816a85a704e4b8edf6978561c1f248a5388
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Nov 21 00:43:29 2025 +0300

    Fix(col): `UuidValidator.from_python` accepts strings as valid input
    
    Fixes: #199.

diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 22d6a34..ad13b0f 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -30,6 +30,8 @@ The contributors for this release are:
 * Dave Mulligan fixed #195: Minor ``NameError`` in ``pgconnection.py``
   when using ``psycopg`` version 1 with a non-default port. Thanks!
 
+* Chris Kauffman found a minor bug in ``UuidValidator``.
+
 * GH user ghaushe-ampere. Thanks for finding an obscure bug!
 
 
diff --git a/docs/News.rst b/docs/News.rst
index 0d55db2..96c5f77 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -11,6 +11,9 @@ SQLObject development (master)
 Bug fixes
 ---------
 
+* ``UuidValidator.from_python()`` now accepts strings as a valid input.
+  This fixes #199.
+
 * Fixed #197: a bug in ``dbconnection.ConnectionURIOpener.registerConnection``
   triggered by non-empty instance's ``name``. The bug was inserted in 2004 so
   it seems nobody ever used named instances. Fixed anyway.
diff --git a/sqlobject/col.py b/sqlobject/col.py
index cf9705d..49cd709 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -2022,6 +2022,8 @@ class UuidValidator(SOValidator):
     def from_python(self, value, state):
         if value is None:
             return None
+        if isinstance(value, str):
+            return value
         if isinstance(value, UUID):
             return str(value)
         raise validators.Invalid(
diff --git a/sqlobject/tests/test_uuidcol.py b/sqlobject/tests/test_uuidcol.py
index 117d80e..d1e2c22 100644
--- a/sqlobject/tests/test_uuidcol.py
+++ b/sqlobject/tests/test_uuidcol.py
@@ -12,11 +12,11 @@ testuuid = UUID('7e3b5c1e-3402-4b10-a3c6-8ee6dbac7d1a')
 
 
 class UuidContainer(SQLObject):
-    uuiddata = UuidCol(default=None)
+    uuiddata = UuidCol(alternateID=True, default=None)
 
 
 def test_uuidCol():
-    setupClass([UuidContainer], force=True)
+    setupClass([UuidContainer])
 
     my_uuid = UuidContainer(uuiddata=testuuid)
     iid = my_uuid.id
@@ -26,3 +26,15 @@ def test_uuidCol():
     my_uuid_2 = UuidContainer.get(iid)
 
     assert my_uuid_2.uuiddata == testuuid
+
+
+def test_alternate_id():
+    setupClass([UuidContainer])
+
+    UuidContainer(uuiddata=testuuid)
+
+    UuidContainer._connection.cache.clear()
+
+    my_uuid_2 = UuidContainer.byUuiddata(testuuid)
+
+    assert my_uuid_2.uuiddata == testuuid

http://sourceforge.net/p/sqlobject/sqlobject/ci/21243137a981eaac7bba32135f183f9e696f5315

commit 21243137a981eaac7bba32135f183f9e696f5315
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Nov 13 20:15:31 2025 +0300

    Docs(ANNOUNCE): Thanks Igor Yudytskiy for PR #194
    
    [skip ci]

diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 5632cfe..22d6a34 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -24,11 +24,15 @@ What's new in SQLObject
 
 The contributors for this release are:
 
+* Igor Yudytskiy. Thanks for PR #194:
+  fix: connect to old mssql versions via set tds_version uri parameter.
+
 * Dave Mulligan fixed #195: Minor ``NameError`` in ``pgconnection.py``
-  when using ``psycopg`` version 1 with a non-default port. Many thanks!
+  when using ``psycopg`` version 1 with a non-default port. Thanks!
 
 * GH user ghaushe-ampere. Thanks for finding an obscure bug!
 
+
 For a more complete list, please see the news:
 http://sqlobject.org/News.html
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/5f9b61c58dd1d50f7f2871a833843256bf5f4f65

commit 5f9b61c58dd1d50f7f2871a833843256bf5f4f65
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Nov 12 00:12:04 2025 +0300

    Docs(ANNOUNCE): Add Dave Mulligan as a contributor
    
    [skip ci]

diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index e221f25..5632cfe 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -22,8 +22,12 @@ I'm pleased to announce version 3.13.0, the first release of branch
 What's new in SQLObject
 =======================
 
-The contributor for this release is GH user ghaushe-ampere.
-Thanks for finding an obscure bug!
+The contributors for this release are:
+
+* Dave Mulligan fixed #195: Minor ``NameError`` in ``pgconnection.py``
+  when using ``psycopg`` version 1 with a non-default port. Many thanks!
+
+* GH user ghaushe-ampere. Thanks for finding an obscure bug!
 
 For a more complete list, please see the news:
 http://sqlobject.org/News.html

http://sourceforge.net/p/sqlobject/sqlobject/ci/806c0a919a14a86997c0c4fec1237fdb5914505d

commit 806c0a919a14a86997c0c4fec1237fdb5914505d
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Nov 11 21:42:25 2025 +0300

    Tests(tox): Exclude some tests
    
    Exclude mysqlclient under Python 3.14; still is not released.
    Exclude psycopg[c] under Python 3.6 and 3.7; seems incompatible with GCC
    running at GH.

diff --git a/tox.ini b/tox.ini
index d36eb7b..032df07 100644
--- a/tox.ini
+++ b/tox.ini
@@ -197,7 +197,7 @@ commands =
     pytest -D "postgres://runner:test@localhost/sqlobject_test?driver=psycopg&charset=utf-8&debug=1"
     dropdb --username=runner --no-password sqlobject_test
 
-[testenv:py3{6,7,8,9,10,11,12,13,14}-postgres-psycopg_c]
+[testenv:py3{8,9,10,11,12,13,14}-postgres-psycopg_c]
 commands = {[psycopg_c]commands}
 
 [psycopg2]
@@ -417,7 +417,7 @@ commands =
     pytest -D "mysql://ODBC@localhost/sqlobject_test?driver=mysqldb&charset=utf8&debug=1"
     mysql --user=ODBC -e "drop database sqlobject_test;"
 
-[testenv:py3{6,7,8,9,10,11,12,13,14}-mysqlclient-w32]
+[testenv:py3{6,7,8,9,10,11,12,13}-mysqlclient-w32]
 platform = win32
 commands = {[mysqlclient-w32]commands}
 
@@ -566,7 +566,7 @@ commands =
     pytest -D "postgres://runner:test@localhost/sqlobject_test?driver=psycopg&charset=utf-8&debug=1"
     dropdb --username=runner --no-password sqlobject_test
 
-[testenv:py3{6,7,8,9,10,11,12,13,14}-postgres-psycopg_c-w32]
+[testenv:py3{8,9,10,11,12,13,14}-postgres-psycopg_c-w32]
 platform = win32
 commands = {[psycopg_c-w32]commands}
 

http://sourceforge.net/p/sqlobject/sqlobject/ci/1fd8272fd8861ed7b7d9011d11720d417216f30b

commit 1fd8272fd8861ed7b7d9011d11720d417216f30b
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Nov 11 21:22:16 2025 +0300

    CI(GHActions): Exclude Python 2.7 on Windows

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 0c9f7da..54f2658 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -11,6 +11,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        exclude:
+        - os: windows-latest
+          python-version: "2.7"
         include:
         - os: ubuntu-latest
           os-name: Linux

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

commit cc5e39ec0e13f01b466463c246a5fe73d64392cb
Author: Oleg Broytman <ph...@ph...>
Date:   Tue Nov 11 21:00:48 2025 +0300

    Fixes a bug in `dbconnection.ConnectionURIOpener.registerConnection`
    
    Fixes a bug triggered by non-empty instance's `name`.
    
    Fixes: #197.

diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index dfdda2c..e221f25 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -22,8 +22,8 @@ I'm pleased to announce version 3.13.0, the first release of branch
 What's new in SQLObject
 =======================
 
-The contributors for this release are ... Thanks!
-
+The contributor for this release is GH user ghaushe-ampere.
+Thanks for finding an obscure bug!
 
 For a more complete list, please see the news:
 http://sqlobject.org/News.html
diff --git a/docs/News.rst b/docs/News.rst
index 2c418b4..0d55db2 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -11,6 +11,10 @@ SQLObject development (master)
 Bug fixes
 ---------
 
+* Fixed #197: a bug in ``dbconnection.ConnectionURIOpener.registerConnection``
+  triggered by non-empty instance's ``name``. The bug was inserted in 2004 so
+  it seems nobody ever used named instances. Fixed anyway.
+
 * Fixed #195: Minor ``NameError`` in ``pgconnection.py``
   when using ``psycopg`` version 1 with a non-default port.
 
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index e691f2d..7517647 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -1080,12 +1080,12 @@ class ConnectionURIOpener(object):
     def registerConnectionInstance(self, inst):
         if inst.name:
             assert (inst.name not in self.instanceNames
-                    or self.instanceNames[inst.name] is cls  # noqa
-                    ), ("A instance has already been registered "
+                    or self.instanceNames[inst.name] is self.__class__
+                    ), ("An instance has already been registered "
                         "with the name %s" % inst.name)
             assert inst.name.find(':') == -1, \
                 "You cannot include ':' " \
... 219 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository