Skip to content

Commit

Permalink
Add support for python 3.12
Browse files Browse the repository at this point in the history
Fixes #416
  • Loading branch information
richin13 committed Nov 14, 2024
1 parent eb9c663 commit 32a7d71
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion graphene_sqlalchemy/converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

from sqlalchemy import types as sqa_types
from sqlalchemy.dialects import postgresql
from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.orm import (
ColumnProperty,
RelationshipProperty,
class_mapper,
interfaces,
strategies,
)
from sqlalchemy.ext.hybrid import hybrid_property

import graphene
from graphene.types.json import JSONString
Expand Down
11 changes: 4 additions & 7 deletions graphene_sqlalchemy/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import warnings
from collections import OrderedDict
from functools import _c3_mro
from importlib.metadata import version as get_version
from typing import Any, Callable, Dict, Optional

import pkg_resources
from packaging import version
from sqlalchemy import select
from sqlalchemy.exc import ArgumentError
from sqlalchemy.orm import class_mapper, object_mapper
Expand All @@ -22,16 +23,12 @@ def get_nullable_type(_type):

def is_sqlalchemy_version_less_than(version_string):
"""Check the installed SQLAlchemy version"""
return pkg_resources.get_distribution(
"SQLAlchemy"
).parsed_version < pkg_resources.parse_version(version_string)
return version.parse(get_version("SQLAlchemy")) < version.parse(version_string)


def is_graphene_version_less_than(version_string): # pragma: no cover
"""Check the installed graphene version"""
return pkg_resources.get_distribution(
"graphene"
).parsed_version < pkg_resources.parse_version(version_string)
return version.parse(get_version("graphene")) < version.parse(version_string)


SQL_VERSION_HIGHER_EQUAL_THAN_1_4 = False
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"promise>=2.3",
"SQLAlchemy>=1.1",
"aiodataloader>=0.2.0,<1.0",
"packaging>=23.0",
]

tests_require = [
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = pre-commit,py{37,38,39,310}-sql{12,13,14,20}
envlist = pre-commit,py{37,38,39,310,311,312}-sql{12,13,14,20}
skipsdist = true
minversion = 3.7.0

Expand Down

0 comments on commit 32a7d71

Please sign in to comment.