Merge lp:~cjwatson/storm/py312 into lp:storm

Proposed by Colin Watson
Status: Merged
Merged at revision: 584
Proposed branch: lp:~cjwatson/storm/py312
Merge into: lp:storm
Diff against target: 78 lines (+8/-5)
4 files modified
NEWS (+1/-0)
setup.py (+2/-1)
storm/databases/postgres.py (+3/-3)
tox.ini (+2/-1)
To merge this branch: bzr merge lp:~cjwatson/storm/py312
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+461677@code.launchpad.net

Commit message

Support Python 3.12.

To post a comment you must log in.
lp:~cjwatson/storm/py312 updated
582. By Colin Watson

Support Python 3.12.

Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve
Revision history for this message
Colin Watson (cjwatson) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2023-12-07 17:04:46 +0000
+++ NEWS 2024-03-03 15:47:39 +0000
@@ -5,6 +5,7 @@
5------------5------------
66
7- Fix several syntax warnings from recent Python versions.7- Fix several syntax warnings from recent Python versions.
8- Support Python 3.12.
89
90.26 (2023-07-04)100.26 (2023-07-04)
10=================11=================
1112
=== modified file 'setup.py'
--- setup.py 2022-10-28 06:26:28 +0000
+++ setup.py 2024-03-03 15:47:39 +0000
@@ -77,6 +77,7 @@
77 "Programming Language :: Python :: 3.9",77 "Programming Language :: Python :: 3.9",
78 "Programming Language :: Python :: 3.10",78 "Programming Language :: Python :: 3.10",
79 "Programming Language :: Python :: 3.11",79 "Programming Language :: Python :: 3.11",
80 "Programming Language :: Python :: 3.12",
80 "Topic :: Database",81 "Topic :: Database",
81 "Topic :: Database :: Front-Ends",82 "Topic :: Database :: Front-Ends",
82 "Topic :: Software Development :: Libraries :: Python Modules",83 "Topic :: Software Development :: Libraries :: Python Modules",
@@ -87,7 +88,7 @@
87 # warning) by distutils.88 # warning) by distutils.
88 include_package_data=True,89 include_package_data=True,
89 zip_safe=False,90 zip_safe=False,
90 install_requires=["six"],91 install_requires=["packaging >= 14.1", "six"],
91 test_suite="storm.tests.find_tests",92 test_suite="storm.tests.find_tests",
92 tests_require=tests_require,93 tests_require=tests_require,
93 extras_require={94 extras_require={
9495
=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py 2019-09-17 09:35:10 +0000
+++ storm/databases/postgres.py 2024-03-03 15:47:39 +0000
@@ -24,17 +24,17 @@
24from datetime import datetime, date, time, timedelta24from datetime import datetime, date, time, timedelta
25import json25import json
2626
27from distutils.version import LooseVersion27from packaging.version import parse as parse_version
2828
29from storm.databases import dummy29from storm.databases import dummy
3030
31# PostgreSQL support in Storm requires psycopg2 2.3.0 or greater, in order31# PostgreSQL support in Storm requires psycopg2 2.3.0 or greater, in order
32# to support the two-phase commit protocol.32# to support the two-phase commit protocol.
33REQUIRED_PSYCOPG2_VERSION = LooseVersion('2.3.0')33REQUIRED_PSYCOPG2_VERSION = parse_version('2.3.0')
34PSYCOPG2_VERSION = None34PSYCOPG2_VERSION = None
35try:35try:
36 import psycopg236 import psycopg2
37 PSYCOPG2_VERSION = LooseVersion(psycopg2.__version__.split(' ')[0])37 PSYCOPG2_VERSION = parse_version(psycopg2.__version__.split(' ')[0])
38 if PSYCOPG2_VERSION < REQUIRED_PSYCOPG2_VERSION:38 if PSYCOPG2_VERSION < REQUIRED_PSYCOPG2_VERSION:
39 psycopg2 = dummy39 psycopg2 = dummy
40 else:40 else:
4141
=== modified file 'tox.ini'
--- tox.ini 2023-02-09 16:28:53 +0000
+++ tox.ini 2024-03-03 15:47:39 +0000
@@ -8,6 +8,7 @@
8 py39-{cextensions,nocextensions}8 py39-{cextensions,nocextensions}
9 py310-{cextensions,nocextensions}9 py310-{cextensions,nocextensions}
10 py311-{cextensions,nocextensions}10 py311-{cextensions,nocextensions}
11 py312-{cextensions,nocextensions}
11 docs12 docs
1213
13[testenv]14[testenv]
@@ -28,7 +29,7 @@
2829
29[testenv:docs]30[testenv:docs]
30basepython =31basepython =
31 python3.1132 python3.12
32commands =33commands =
33 sphinx-build -b html -d storm/docs/_build/doctrees storm/docs storm/docs/_build/html34 sphinx-build -b html -d storm/docs/_build/doctrees storm/docs storm/docs/_build/html
34deps =35deps =

Subscribers

People subscribed via source and target branches

to status/vote changes: