Skip to content

Commit 32a7d71

Browse files
committed
Add support for python 3.12
Fixes #416
1 parent eb9c663 commit 32a7d71

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

graphene_sqlalchemy/converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
from sqlalchemy import types as sqa_types
99
from sqlalchemy.dialects import postgresql
10+
from sqlalchemy.ext.hybrid import hybrid_property
1011
from sqlalchemy.orm import (
1112
ColumnProperty,
1213
RelationshipProperty,
1314
class_mapper,
1415
interfaces,
1516
strategies,
1617
)
17-
from sqlalchemy.ext.hybrid import hybrid_property
1818

1919
import graphene
2020
from graphene.types.json import JSONString

graphene_sqlalchemy/utils.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import warnings
44
from collections import OrderedDict
55
from functools import _c3_mro
6+
from importlib.metadata import version as get_version
67
from typing import Any, Callable, Dict, Optional
78

8-
import pkg_resources
9+
from packaging import version
910
from sqlalchemy import select
1011
from sqlalchemy.exc import ArgumentError
1112
from sqlalchemy.orm import class_mapper, object_mapper
@@ -22,16 +23,12 @@ def get_nullable_type(_type):
2223

2324
def is_sqlalchemy_version_less_than(version_string):
2425
"""Check the installed SQLAlchemy version"""
25-
return pkg_resources.get_distribution(
26-
"SQLAlchemy"
27-
).parsed_version < pkg_resources.parse_version(version_string)
26+
return version.parse(get_version("SQLAlchemy")) < version.parse(version_string)
2827

2928

3029
def is_graphene_version_less_than(version_string): # pragma: no cover
3130
"""Check the installed graphene version"""
32-
return pkg_resources.get_distribution(
33-
"graphene"
34-
).parsed_version < pkg_resources.parse_version(version_string)
31+
return version.parse(get_version("graphene")) < version.parse(version_string)
3532

3633

3734
SQL_VERSION_HIGHER_EQUAL_THAN_1_4 = False

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"promise>=2.3",
1818
"SQLAlchemy>=1.1",
1919
"aiodataloader>=0.2.0,<1.0",
20+
"packaging>=23.0",
2021
]
2122

2223
tests_require = [

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = pre-commit,py{37,38,39,310}-sql{12,13,14,20}
2+
envlist = pre-commit,py{37,38,39,310,311,312}-sql{12,13,14,20}
33
skipsdist = true
44
minversion = 3.7.0
55

0 commit comments

Comments
 (0)