diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0d74093af..68620beb5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,13 +12,17 @@ jobs: strategy: max-parallel: 4 matrix: - django: ["3.2", "4.2", "5.0", "5.1", "5.2"] - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + django: ["3.2", "4.2", "5.0", "5.1", "5.2", "6.0"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"] exclude: - django: "3.2" python-version: "3.11" - django: "3.2" python-version: "3.12" + - django: "3.2" + python-version: "3.13" + - django: "3.2" + python-version: "3.14" - django: "5.0" python-version: "3.8" - django: "5.0" @@ -31,6 +35,14 @@ jobs: python-version: "3.8" - django: "5.2" python-version: "3.9" + - django: "6.0" + python-version: "3.8" + - django: "6.0" + python-version: "3.9" + - django: "6.0" + python-version: "3.10" + - django: "6.0" + python-version: "3.11" steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/graphene_django/filter/filterset.py b/graphene_django/filter/filterset.py index 7e0d0c520..78af9cf24 100644 --- a/graphene_django/filter/filterset.py +++ b/graphene_django/filter/filterset.py @@ -11,6 +11,8 @@ GRAPHENE_FILTER_SET_OVERRIDES = { models.AutoField: {"filter_class": GlobalIDFilter}, + models.BigAutoField: {"filter_class": GlobalIDFilter}, + models.SmallAutoField: {"filter_class": GlobalIDFilter}, models.OneToOneField: {"filter_class": GlobalIDFilter}, models.ForeignKey: {"filter_class": GlobalIDFilter}, models.ManyToManyField: {"filter_class": GlobalIDMultipleChoiceFilter}, diff --git a/setup.py b/setup.py index 6fc0a1816..1f83fe35b 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,6 @@ "pytest-cov", "pytest-random-order", "coveralls", - "mock", "pytz", "django-filter>=22.1", "pytest-django>=4.5.2", @@ -57,6 +56,7 @@ "Framework :: Django :: 4.2", "Framework :: Django :: 5.1", "Framework :: Django :: 5.2", + "Framework :: Django :: 6.0", ], keywords="api graphql protocol rest relay graphene", packages=find_packages(exclude=["tests", "examples", "examples.*"]), @@ -64,11 +64,10 @@ "graphene>=3.0,<4", "graphql-core>=3.1.0,<4", "graphql-relay>=3.1.1,<4", - "Django>=3.2,<6", + "Django>=3.2", "promise>=2.1", "text-unidecode", ], - setup_requires=["pytest-runner"], tests_require=tests_require, rest_framework_require=rest_framework_require, extras_require={ diff --git a/tox.ini b/tox.ini index a6c91a2ba..996ee7010 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,8 @@ envlist = py{38,39,310}-django32 py{38,39}-django42 - py{310,311,312}-django{42,50,51,main} + py{310,311,312,313,314}-django{42,50,51,main} + py{312,313,314}-django60 pre-commit [gh-actions] @@ -12,6 +13,8 @@ python = 3.10: py310 3.11: py311 3.12: py312 + 3.13: py313 + 3.14: py314 [gh-actions:env] DJANGO = @@ -20,6 +23,7 @@ DJANGO = 5.0: django50 5.1: django51 5.2: django52 + 6.0: django60 main: djangomain [testenv] @@ -36,6 +40,7 @@ deps = django50: Django>=5.0,<5.1 django51: Django>=5.1,<5.2 django52: Django>=5.2,<6.0 + django60: Django>=6.0,<6.1 djangomain: https://github.com/django/django/archive/main.zip commands = {posargs:pytest --cov=graphene_django graphene_django examples}