Storm

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

  1. py312
  2. Merge into trunk
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
1=== modified file 'NEWS'
2--- NEWS 2023-12-07 17:04:46 +0000
3+++ NEWS 2024-03-03 15:47:39 +0000
4@@ -5,6 +5,7 @@
5 ------------
6
7 - Fix several syntax warnings from recent Python versions.
8+- Support Python 3.12.
9
10 0.26 (2023-07-04)
11 =================
12
13=== modified file 'setup.py'
14--- setup.py 2022-10-28 06:26:28 +0000
15+++ setup.py 2024-03-03 15:47:39 +0000
16@@ -77,6 +77,7 @@
17 "Programming Language :: Python :: 3.9",
18 "Programming Language :: Python :: 3.10",
19 "Programming Language :: Python :: 3.11",
20+ "Programming Language :: Python :: 3.12",
21 "Topic :: Database",
22 "Topic :: Database :: Front-Ends",
23 "Topic :: Software Development :: Libraries :: Python Modules",
24@@ -87,7 +88,7 @@
25 # warning) by distutils.
26 include_package_data=True,
27 zip_safe=False,
28- install_requires=["six"],
29+ install_requires=["packaging >= 14.1", "six"],
30 test_suite="storm.tests.find_tests",
31 tests_require=tests_require,
32 extras_require={
33
34=== modified file 'storm/databases/postgres.py'
35--- storm/databases/postgres.py 2019-09-17 09:35:10 +0000
36+++ storm/databases/postgres.py 2024-03-03 15:47:39 +0000
37@@ -24,17 +24,17 @@
38 from datetime import datetime, date, time, timedelta
39 import json
40
41-from distutils.version import LooseVersion
42+from packaging.version import parse as parse_version
43
44 from storm.databases import dummy
45
46 # PostgreSQL support in Storm requires psycopg2 2.3.0 or greater, in order
47 # to support the two-phase commit protocol.
48-REQUIRED_PSYCOPG2_VERSION = LooseVersion('2.3.0')
49+REQUIRED_PSYCOPG2_VERSION = parse_version('2.3.0')
50 PSYCOPG2_VERSION = None
51 try:
52 import psycopg2
53- PSYCOPG2_VERSION = LooseVersion(psycopg2.__version__.split(' ')[0])
54+ PSYCOPG2_VERSION = parse_version(psycopg2.__version__.split(' ')[0])
55 if PSYCOPG2_VERSION < REQUIRED_PSYCOPG2_VERSION:
56 psycopg2 = dummy
57 else:
58
59=== modified file 'tox.ini'
60--- tox.ini 2023-02-09 16:28:53 +0000
61+++ tox.ini 2024-03-03 15:47:39 +0000
62@@ -8,6 +8,7 @@
63 py39-{cextensions,nocextensions}
64 py310-{cextensions,nocextensions}
65 py311-{cextensions,nocextensions}
66+ py312-{cextensions,nocextensions}
67 docs
68
69 [testenv]
70@@ -28,7 +29,7 @@
71
72 [testenv:docs]
73 basepython =
74- python3.11
75+ python3.12
76 commands =
77 sphinx-build -b html -d storm/docs/_build/doctrees storm/docs storm/docs/_build/html
78 deps =

Subscribers

People subscribed via source and target branches

to status/vote changes: