diff --git a/CHANGELOG.md b/CHANGELOG.md index 1835f56..d3f2a84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [0.3.1] - TBD + +### Changed + - graphql-server updated + + ## [0.3.0] - 2025-07-29 ### Changed diff --git a/nshm_model_graphql_api/nshm_model_graphql_api.py b/nshm_model_graphql_api/nshm_model_graphql_api.py index 1aae443..af49903 100644 --- a/nshm_model_graphql_api/nshm_model_graphql_api.py +++ b/nshm_model_graphql_api/nshm_model_graphql_api.py @@ -7,7 +7,7 @@ import yaml from flask import Flask from flask_cors import CORS -from graphql_server.flask import GraphQLView +from graphql_server.flask.views import GraphQLView # from nshm_model_graphql_api.library_version_check import log_library_info from nshm_model_graphql_api.schema import schema_root diff --git a/poetry.lock b/poetry.lock index 1ace480..585b1b4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.1.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand. [[package]] name = "aniso8601" @@ -400,29 +400,36 @@ graphql-core = ">=3.2,<3.3" [[package]] name = "graphql-server" -version = "3.0.0b7" -description = "GraphQL Server tools for powering your server" +version = "3.0.0" +description = "A library setting up a GraphQL server in a variety of frameworks" optional = false -python-versions = "*" +python-versions = "<4.0,>=3.9" groups = ["main"] files = [ - {file = "graphql-server-3.0.0b7.tar.gz", hash = "sha256:99adc23fb40c2e5d304215e2730b945f2883ee008c93f302438d849ab1d4e9e7"}, + {file = "graphql_server-3.0.0-py3-none-any.whl", hash = "sha256:98f2259003c404f972479df49b5e019497f44c7ba2f447170a1fb981b4f271d2"}, + {file = "graphql_server-3.0.0.tar.gz", hash = "sha256:a21156ae32448ec46989fcc6f65f4eb966a2f23c15936029b5c56b487b786039"}, ] [package.dependencies] -flask = {version = ">=1,<4", optional = true, markers = "extra == \"flask\""} -graphql-core = ">=3.2,<3.3" -typing-extensions = ">=4,<5" +flask = {version = ">=1.1", optional = true, markers = "extra == \"flask\""} +graphql-core = ">=3.2.0,<3.4.0" [package.extras] -aiohttp = ["aiohttp (>=3.8,<4)"] -all = ["aiohttp (>=3.8,<4)", "flask (>=1,<4)", "graphql-core (>=3.2,<3.3)", "quart (>=0.15,<1)", "sanic (>=21.12,<24)", "typing-extensions (>=4,<5)", "webob (>=1.8.7,<2)"] -dev = ["Jinja2 (>=3.1,<4)", "aiohttp (>=3.8,<4)", "black (>=23.9,<23.10)", "check-manifest (>=0.47,<1)", "flake8 (>=6,<7)", "flask (>=1,<4)", "graphql-core (>=3.2,<3.3)", "isort (>=5,<6)", "mypy (>=1.6,<1.7)", "pytest (>=7.2,<8)", "pytest-asyncio (>=0.20,<1)", "pytest-cov (>=4,<5)", "quart (>=0.15,<1)", "sanic (>=21.12,<24)", "sanic-testing (>=22.3,<24)", "typing-extensions (>=4,<5)", "webob (>=1.8.7,<2)"] -flask = ["flask (>=1,<4)"] -quart = ["quart (>=0.15,<1)"] -sanic = ["sanic (>=21.12,<24)"] -test = ["Jinja2 (>=3.1,<4)", "aiohttp (>=3.8,<4)", "flask (>=1,<4)", "graphql-core (>=3.2,<3.3)", "pytest (>=7.2,<8)", "pytest-asyncio (>=0.20,<1)", "pytest-cov (>=4,<5)", "quart (>=0.15,<1)", "sanic (>=21.12,<24)", "sanic-testing (>=22.3,<24)", "typing-extensions (>=4,<5)", "webob (>=1.8.7,<2)"] -webob = ["webob (>=1.8.7,<2)"] +aiohttp = ["aiohttp (>=3.7.4.post0,<4)"] +asgi = ["python-multipart (>=0.0.7)", "starlette (>=0.18.0)"] +chalice = ["chalice (>=1.22,<2.0)"] +channels = ["asgiref (>=3.2,<4.0)", "channels (>=3.0.5)"] +debug = ["libcst", "rich (>=12.0.0)"] +debug-server = ["libcst", "pygments (>=2.3,<3.0)", "python-multipart (>=0.0.7)", "rich (>=12.0.0)", "starlette (>=0.18.0)", "typer (>=0.7.0)", "uvicorn (>=0.11.6)", "websockets (>=15.0.1,<16)"] +django = ["asgiref (>=3.2,<4.0)", "django (>=3.2)"] +fastapi = ["fastapi (>=0.65.2)", "python-multipart (>=0.0.7)"] +flask = ["flask (>=1.1)"] +litestar = ["litestar (>=2) ; python_full_version >= \"3.10.0\" and python_full_version < \"4.0.0\""] +opentelemetry = ["opentelemetry-api (<2)", "opentelemetry-sdk (<2)"] +pyinstrument = ["pyinstrument (>=4.0.0)"] +quart = ["quart (>=0.19.3)"] +sanic = ["sanic (>=20.12.2)"] +webob = ["webob (>=1.8)"] [[package]] name = "griffe" @@ -1290,6 +1297,7 @@ files = [ {file = "typing_extensions-4.12.1-py3-none-any.whl", hash = "sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a"}, {file = "typing_extensions-4.12.1.tar.gz", hash = "sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1"}, ] +markers = {main = "python_version == \"3.10\""} [[package]] name = "virtualenv" @@ -1376,4 +1384,4 @@ watchdog = ["watchdog (>=2.3)"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "4c92f8ef5e8ce8bb0ba1b92581d120d0538b0a77cfafab8914a3ec07f363e968" +content-hash = "00037307bf8d2c2d02dd47ed3d9d50ce57ea60d799accb3169920fa6383b1607" diff --git a/pyproject.toml b/pyproject.toml index 76c6476..316cb18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ nzshm-model = "0.10.6" flask = "^3.0.3" flask-cors = "^4.0.1" pyyaml = "^6.0.1" -graphql-server = {extras = ["flask"], version = "^3.0.0b7"} +graphql-server = {extras = ["flask"], version = "^3.0.0"} graphene = "^3.3" # nzshm-model = "^0.9.3"