Skip to content

Commit

Permalink
Merge branch 'master' into fix-fragments-merging
Browse files Browse the repository at this point in the history
kindermax authored Jun 10, 2024
2 parents 6fe5e89 + 2232618 commit 3674817
Showing 9 changed files with 1,577 additions and 2,862 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
7 changes: 0 additions & 7 deletions Makefile

This file was deleted.

117 changes: 14 additions & 103 deletions docs/example_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

337 changes: 20 additions & 317 deletions hiku/protobuf/query_pb2.py
2,435 changes: 1,298 additions & 1,137 deletions pdm.lock

Large diffs are not rendered by default.

46 changes: 26 additions & 20 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ classifiers = [
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3 :: Only',
'Topic :: Software Development :: Libraries :: Python Modules',
]
@@ -50,34 +51,35 @@ excludes = [ "tests", "**/.*.*" ]

[tool.pdm.dev-dependencies]
test = [
"astor==0.8.1",
"pytest>=7.3.1",
"pytest-cov>=4.0.0",
"pytest-asyncio",
"faker",
"astor>=0.8.1",
"pytest>=7.4.2",
"pytest-cov>=4.1.0",
"pytest-asyncio>=0.21.1",
"faker>=18.13.0",
"pytest-benchmark[histogram]>=4.0.0",
"asyncpg", # for tests_pg
"greenlet", # for tests_pg
"asyncpg>=0.28.0", # for tests_pg
"greenlet>=3.0.0", # for tests_pg
]
dev = [
"graphql-core", # for graphql support
"sqlalchemy>=1.3.9,<2.0.0",
"protobuf<4.0.0", # for protobuf support
"aiopg", # for async postgresql support
"prometheus-client", # for prometheus metrics
"sentry-sdk", # for sentry tracing
"typing-extensions",
"mypy",
"black",
"flake8==5.0.4",
"graphql-core>=3.2.3", # for graphql support
"sqlalchemy<2",
"protobuf>=4.24.4", # for protobuf support
"aiopg>=1.4.0", # for async postgresql support
"prometheus-client>=0.17.1", # for prometheus metrics
"sentry-sdk>=1.31.0", # for sentry tracing
"typing-extensions>=4.7.1",
"mypy>=1.4.1",
"black>=23.3.0",
"flake8>=5.0.4",
"grpcio-tools>=1.59.0",
]
docs = [
"sphinx==5.0.2",
"sphinx>=5.3.0",
"furo>=2023.3.27",
]
examples = [
"flask==2.1.3",
"aiohttp==3.8.4",
"flask>=2.2.5",
"aiohttp>=3.8.6",
]

[tool.pdm.resolution.overrides]
@@ -96,6 +98,10 @@ docs = "sphinx-build -b html docs docs/build"
docs-open = "open docs/build/index.html"
check = {composite = ["fmt", "test", "mypy", "flake"]}
example = "python examples/{args:graphql_flask}.py"
proto-query = "python -m grpc_tools.protoc -I. --python_out=. hiku/protobuf/query.proto"
proto-tests = "python -m grpc_tools.protoc -I. --python_out=. tests/protobuf/result.proto"
proto-example = "python -m grpc_tools.protoc -I. --python_out=. docs/example.proto"
proto = {composite = ["proto-query", "proto-tests", "proto-example"]}

[tool.pytest.ini_options]
addopts = "--tb=native --benchmark-disable"
1,168 changes: 39 additions & 1,129 deletions tests/protobuf/result_pb2.py

Large diffs are not rendered by default.

324 changes: 177 additions & 147 deletions tests/test_engine.py

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py37,pypy3,py38,py39,py310,py311
envlist = py37,pypy3,py38,py39,py310,py311,p312

[testenv]
groups = dev,test
@@ -13,3 +13,4 @@ python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312

0 comments on commit 3674817

Please sign in to comment.