Prepare for minor release

WebwareForPython · Mar 17, 2024 · 06a7b94 · 06a7b94
1 parent 4e2f3f1
commit 06a7b94
Show file tree

Hide file tree

Showing 16 changed files with 92 additions and 67 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.1.0b1
+current_version = 3.1.0
 
 [bumpversion:file:pyproject.toml]
 search = version = "{current_version}"

diff --git a/.github/workflows/publish_on_pypi.yml b/.github/workflows/publish_on_pypi.yml
@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.10"
+        python-version: "3.11"
 
     - name: Install build tool
       run: python -m pip install build --user

diff --git a/.github/workflows/test_with_tox.yml b/.github/workflows/test_with_tox.yml
@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python ${{ matrix.python }}
         uses: actions/setup-python@v4
@@ -21,5 +21,5 @@ jobs:
 
       - run: tox -e py
 
-      - if: matrix.python == 3.10
+      - if: matrix.python == 3.11
         run: TOXENV=ruff,manifest,docs,spell tox
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 Christoph Zwerschke
+Copyright (c) 2024 Christoph Zwerschke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ to a database that can be used in all kinds of multi-threaded environments.
 The suite supports DB-API 2 compliant database interfaces
 and the classic PyGreSQL interface.
 
-The current version 3.0.3 of DBUtils supports Python versions 3.6 to 3.11.
+The current version 3.1.0 of DBUtils supports Python versions 3.7 to 3.12.
 
 **Please have a look at the [changelog](https://webwareforpython.github.io/DBUtils/changelog.html), because there were some breaking changes in version 2.0.**
 

diff --git a/dbutils/__init__.py b/dbutils/__init__.py
@@ -5,4 +5,4 @@
     'simple_pooled_pg', 'steady_pg', 'pooled_pg', 'persistent_pg',
     'simple_pooled_db', 'steady_db', 'pooled_db', 'persistent_db']
 
-__version__ = '3.0.3'
+__version__ = '3.1.0'
diff --git a/docs/changelog.html b/docs/changelog.html
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
+<meta name="generator" content="Docutils 0.20.1: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />
 <title>Changelog for DBUtils</title>
 <link rel="stylesheet" href="doc.css" type="text/css" />
 </head>
@@ -12,6 +12,15 @@
 <h1 class="title">Changelog for DBUtils</h1>
 
 <section id="section-1">
+<h2>3.1.0</h2>
+<p>DBUtils 3.1.0 was released on March 17, 2024.</p>
+<p>Changes:</p>
+<ul class="simple">
+<li><p>Support Python version 3.12, cease support for Python 3.6.</p></li>
+<li><p>Various small internal improvements and modernizations.</p></li>
+</ul>
+</section>
+<section id="section-2">
 <h2>3.0.3</h2>
 <p>DBUtils 3.0.3 was released on April 27, 2023.</p>
 <p>Changes:</p>
@@ -21,19 +30,19 @@ <h2>3.0.3</h2>
 <li><p>Minor fixes and section an advanced usage in docs.</p></li>
 </ul>
 </section>
-<section id="section-2">
+<section id="section-3">
 <h2>3.0.2</h2>
 <p>DBUtils 3.0.2 was released on January 14, 2022.</p>
 <p>The optional iterator protocol on cursors is now supported.</p>
 </section>
-<section id="section-3">
+<section id="section-4">
 <h2>3.0.1</h2>
 <p>DBUtils 3.0.1 was released on December 22, 2021.</p>
 <p>It includes <span class="docutils literal">InterfaceError</span> to the default list of exceptions
 for which the connection failover mechanism is applied.
 You can override this with the <span class="docutils literal">failures</span> parameter.</p>
 </section>
-<section id="section-4">
+<section id="section-5">
 <h2>3.0.0</h2>
 <p>DBUtils 3.0.0 was released on November 26, 2021.</p>
 <p>It is intended to be used with Python versions 3.6 to 3.10.</p>
@@ -42,31 +51,31 @@ <h2>3.0.0</h2>
 <li><p>Cease support for Python 2 and 3.5, minor optimizations.</p></li>
 </ul>
 </section>
-<section id="section-5">
+<section id="section-6">
 <h2>2.0.3</h2>
 <p>DBUtils 2.0.3 was released on November 26, 2021.</p>
 <p>Changes:</p>
 <ul class="simple">
 <li><p>Support Python version 3.10.</p></li>
 </ul>
 </section>
-<section id="section-6">
+<section id="section-7">
 <h2>2.0.2</h2>
 <p>DBUtils 2.0.2 was released on June 8, 2021.</p>
 <p>Changes:</p>
 <ul class="simple">
 <li><p>Allow using context managers for pooled connections.</p></li>
 </ul>
 </section>
-<section id="section-7">
+<section id="section-8">
 <h2>2.0.1</h2>
 <p>DBUtils 2.0.1 was released on April 8, 2021.</p>
 <p>Changes:</p>
 <ul class="simple">
 <li><p>Avoid &quot;name Exception is not defined&quot; when exiting.</p></li>
 </ul>
 </section>
-<section id="section-8">
+<section id="section-9">
 <h2>2.0</h2>
 <p>DBUtils 2.0 was released on September 26, 2020.</p>
 <p>It is intended to be used with Python versions 2.7 and 3.5 to 3.9.</p>
@@ -82,7 +91,7 @@ <h2>2.0</h2>
 <li><p>This changelog has been compiled from the former release notes.</p></li>
 </ul>
 </section>
-<section id="section-9">
+<section id="section-10">
 <h2>1.4</h2>
 <p>DBUtils 1.4 was released on September 26, 2020.</p>
 <p>It is intended to be used with Python versions 2.7 and 3.5 to 3.9.</p>
@@ -93,7 +102,7 @@ <h2>1.4</h2>
 inside a transaction.</p></li>
 </ul>
 </section>
-<section id="section-10">
+<section id="section-11">
 <h2>1.3</h2>
 <p>DBUtils 1.3 was released on March 3, 2018.</p>
 <p>It is intended to be used with Python versions 2.6, 2.7 and 3.4 to 3.7.</p>
@@ -102,12 +111,12 @@ <h2>1.3</h2>
 <li><p>This version now supports context handlers for connections and cursors.</p></li>
 </ul>
 </section>
-<section id="section-11">
+<section id="section-12">
 <h2>1.2</h2>
 <p>DBUtils 1.2 was released on February 5, 2017.</p>
 <p>It is intended to be used with Python versions 2.6, 2.7 and 3.0 to 3.6.</p>
 </section>
-<section id="section-12">
+<section id="section-13">
 <h2>1.1.1</h2>
 <p>DBUtils 1.1.1 was released on February 4, 2017.</p>
 <p>It is intended to be used with Python versions 2.3 to 2.7.</p>
@@ -121,7 +130,7 @@ <h2>1.1.1</h2>
 <li><p>Fixed a problem when running under Jython (reported by Vitaly Kruglikov).</p></li>
 </ul>
 </section>
-<section id="section-13">
+<section id="section-14">
 <h2>1.1</h2>
 <p>DBUtils 1.1 was released on August 14, 2011.</p>
 <p>Improvements:</p>
@@ -150,7 +159,7 @@ <h2>1.1</h2>
 <li><p>Fixed some minor issues with the <span class="docutils literal">DBUtilsExample</span> for Webware.</p></li>
 </ul>
 </section>
-<section id="section-14">
+<section id="section-15">
 <h2>1.0</h2>
 <p>DBUtils 1.0 was released on November 29, 2008.</p>
 <p>It is intended to be used with Python versions 2.2 to 2.6.</p>
@@ -183,7 +192,7 @@ <h2>1.0</h2>
 the MySQLdb module (problem reported by Gregory Pinero).</p></li>
 </ul>
 </section>
-<section id="section-15">
+<section id="section-16">
 <h2>0.9.4</h2>
 <p>DBUtils 0.9.4 was released on July 7, 2007.</p>
 <p>This release fixes a problem in the destructor code and has been supplemented
@@ -192,7 +201,7 @@ <h2>0.9.4</h2>
 in the last release, since you can now pass custom creator functions
 for database connections instead of DB-API 2 modules.</p>
 </section>
-<section id="section-16">
+<section id="section-17">
 <h2>0.9.3</h2>
 <p>DBUtils 0.9.3 was released on May 21, 2007.</p>
 <p>Changes:</p>
@@ -207,7 +216,7 @@ <h2>0.9.3</h2>
 Added Chinese translation of the User's Guide, kindly contributed by gashero.</p></li>
 </ul>
 </section>
-<section id="section-17">
+<section id="section-18">
 <h2>0.9.2</h2>
 <p>DBUtils 0.9.2 was released on September 22, 2006.</p>
 <p>It is intended to be used with Python versions 2.2 to 2.5.</p>
@@ -217,7 +226,7 @@ <h2>0.9.2</h2>
 storage engine. Accordingly, renamed <span class="docutils literal">SolidPg</span> to <span class="docutils literal">SteadyPg</span>.</p></li>
 </ul>
 </section>
-<section id="section-18">
+<section id="section-19">
 <h2>0.9.1</h2>
 <p>DBUtils 0.9.1 was released on May 8, 2006.</p>
 <p>It is intended to be used with Python versions 2.2 to 2.4.</p>
@@ -231,7 +240,7 @@ <h2>0.9.1</h2>
 <li><p>Improved the documentation and added a User's Guide.</p></li>
 </ul>
 </section>
-<section id="section-19">
+<section id="section-20">
 <h2>0.8.1 - 2005-09-13</h2>
 <p>DBUtils 0.8.1 was released on September 13, 2005.</p>
 <p>It is intended to be used with Python versions 2.0 to 2.4.</p>

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,6 +1,17 @@
 Changelog for DBUtils
 +++++++++++++++++++++
 
+3.1.0
+=====
+
+DBUtils 3.1.0 was released on March 17, 2024.
+
+Changes:
+
+* Support Python version 3.12, cease support for Python 3.6.
+* Various small internal improvements and modernizations.
+
+
 3.0.3
 =====
 

diff --git a/docs/main.de.html b/docs/main.de.html
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
 <head>
 <meta charset="utf-8" />
+<meta name="generator" content="Docutils 0.20.1: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />
 <title>Benutzeranleitung für DBUtils</title>
 <link rel="stylesheet" href="doc.css" type="text/css" />
 </head>
@@ -12,7 +12,7 @@
 <h1 class="title">Benutzeranleitung für DBUtils</h1>
 <dl class="docinfo simple">
 <dt class="version">Version<span class="colon">:</span></dt>
-<dd class="version">3.0.3</dd>
+<dd class="version">3.1.0</dd>
 <dt class="translations">Translations<span class="colon">:</span></dt>
 <dd class="translations"><p><a class="reference external" href="main.html">English</a> | German</p>
 </dd>
@@ -137,7 +137,7 @@ <h3>Installation</h3>
 </section>
 <section id="anforderungen">
 <h2>Anforderungen</h2>
-<p>DBUtils unterstützt die <a class="reference external" href="https://www.python.org">Python</a> Versionen 3.6 bis 3.11.</p>
+<p>DBUtils unterstützt die <a class="reference external" href="https://www.python.org">Python</a> Versionen 3.7 bis 3.12.</p>
 <p>Die Module in der Variante für klassisches PyGreSQL benötigen <a class="reference external" href="https://www.pygresql.org/">PyGreSQL</a>
 Version 4.0 oder höher, während die Module in der allgemeinen Variante
 für DB-API 2 mit jedem beliebigen Python-Datenbankadapter-Modul zusammenarbeiten,
@@ -536,7 +536,7 @@ <h2>Autoren</h2>
 </section>
 <section id="copyright-und-lizenz">
 <h2>Copyright und Lizenz</h2>
-<p>Copyright © 2005-2023 Christoph Zwerschke.
+<p>Copyright © 2005-2024 Christoph Zwerschke.
 Alle Rechte vorbehalten.</p>
 <p>DBUtils ist freie und quelloffene Software,
 lizenziert unter der <a class="reference external" href="https://opensource.org/licenses/MIT">MIT-Lizenz</a>.</p>

diff --git a/docs/main.de.rst b/docs/main.de.rst
@@ -1,7 +1,7 @@
 Benutzeranleitung für DBUtils
 +++++++++++++++++++++++++++++
 
-:Version: 3.0.3
+:Version: 3.1.0
 :Translations: English_ | German
 
 .. _English: main.html
@@ -98,7 +98,7 @@ herunterzuladen und zu installieren::
 Anforderungen
 =============
 
-DBUtils unterstützt die Python_ Versionen 3.6 bis 3.11.
+DBUtils unterstützt die Python_ Versionen 3.7 bis 3.12.
 
 Die Module in der Variante für klassisches PyGreSQL benötigen PyGreSQL_
 Version 4.0 oder höher, während die Module in der allgemeinen Variante
@@ -583,7 +583,7 @@ Autoren
 Copyright und Lizenz
 ====================
 
-Copyright © 2005-2023 Christoph Zwerschke.
+Copyright © 2005-2024 Christoph Zwerschke.
 Alle Rechte vorbehalten.
 
 DBUtils ist freie und quelloffene Software,

diff --git a/docs/main.html b/docs/main.html
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
+<meta name="generator" content="Docutils 0.20.1: https://docutils.sourceforge.io/" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<meta name="generator" content="Docutils 0.19: https://docutils.sourceforge.io/" />
 <title>DBUtils User's Guide</title>
 <link rel="stylesheet" href="doc.css" type="text/css" />
 </head>
@@ -12,7 +12,7 @@
 <h1 class="title">DBUtils User's Guide</h1>
 <dl class="docinfo simple">
 <dt class="version">Version<span class="colon">:</span></dt>
-<dd class="version">3.0.3</dd>
+<dd class="version">3.1.0</dd>
 <dt class="translations">Translations<span class="colon">:</span></dt>
 <dd class="translations"><p>English | <a class="reference external" href="main.de.html">German</a></p>
 </dd>
@@ -134,7 +134,7 @@ <h3>Installation</h3>
 </section>
 <section id="requirements">
 <h2>Requirements</h2>
-<p>DBUtils supports <a class="reference external" href="https://www.python.org">Python</a> versions 3.6 to 3.11.</p>
+<p>DBUtils supports <a class="reference external" href="https://www.python.org">Python</a> versions 3.7 to 3.12.</p>
 <p>The modules in the classic PyGreSQL variant need <a class="reference external" href="https://www.pygresql.org/">PyGreSQL</a> version 4.0
 or above, while the modules in the universal DB-API 2 variant run with
 any Python <a class="reference external" href="https://www.python.org/dev/peps/pep-0249/">DB-API 2</a> compliant database interface module.</p>
@@ -494,7 +494,7 @@ <h2>Credits</h2>
 </section>
 <section id="copyright-and-license">
 <h2>Copyright and License</h2>
-<p>Copyright © 2005-2023 by Christoph Zwerschke.
+<p>Copyright © 2005-2024 by Christoph Zwerschke.
 All Rights Reserved.</p>
 <p>DBUtils is free and open source software,
 licensed under the <a class="reference external" href="https://opensource.org/licenses/MIT">MIT license</a>.</p>

diff --git a/docs/main.rst b/docs/main.rst
@@ -1,7 +1,7 @@
 DBUtils User's Guide
 ++++++++++++++++++++
 
-:Version: 3.0.3
+:Version: 3.1.0
 :Translations: English | German_
 
 .. _German: main.de.html
@@ -95,7 +95,7 @@ It is even easier to download and install the package in one go using `pip`_::
 Requirements
 ============
 
-DBUtils supports Python_ versions 3.6 to 3.11.
+DBUtils supports Python_ versions 3.7 to 3.12.
 
 The modules in the classic PyGreSQL variant need PyGreSQL_ version 4.0
 or above, while the modules in the universal DB-API 2 variant run with
@@ -543,7 +543,7 @@ Credits
 Copyright and License
 =====================
 
-Copyright © 2005-2023 by Christoph Zwerschke.
+Copyright © 2005-2024 by Christoph Zwerschke.
 All Rights Reserved.
 
 DBUtils is free and open source software,