Skip to content

Commit

Permalink
Merge branch 'main' into fix-lost-db-connection
Browse files Browse the repository at this point in the history
  • Loading branch information
ahdamin authored Oct 7, 2024
2 parents 422737c + 6fbaf04 commit ad653de
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.0.17
current_version = 3.0.18
commit = True
tag = True
tag_name = v{new_version}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out git repository
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
Expand All @@ -18,4 +18,4 @@ jobs:
uses: psf/black@stable
with:
options: ". --check --line-length 100"
version: "~=24.1.0"
version: "~=24.8.0"
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
repos:
- repo: https://github.com/psf/black
rev: 24.1.0
rev: 24.8.0
hooks:
- id: black
args: [--line-length=100]
- repo: https://github.com/pycqa/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
name: isort
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.7
rev: v0.6.8
hooks:
- id: ruff

2 changes: 1 addition & 1 deletion genotype_api/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.0.17"
__version__ = "3.0.18"
16 changes: 15 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "genotype-api"
version = "3.0.17"
version = "3.0.18"
description = "Genotype-api"
authors = ["Christian Oertlin <[email protected]>"]
readme = "README.md"
Expand All @@ -11,6 +11,7 @@ bcrypt = "^4.1.2"
bump2version = "^1.0.1"
click = "^8.1.7"
coloredlogs = "^15.0.1"
cryptography = "^42.0.8"
email-validator = "^2.1.1"
fastapi = ">=0.109.1"
google-auth = "^2.29.0"
Expand All @@ -37,6 +38,7 @@ aiomysql = "^0.2.0"
pytest-asyncio = "^0.24.0"



[tool.poetry.group.dev.dependencies]
bump2version = "^1.0.1"
coveralls = "^3.3.1"
Expand All @@ -48,3 +50,15 @@ pytest = ">=5.2"
[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

[tool.black]
line-length = 100

[tool.isort]
profile = "black"

[tool.ruff]
line-length = 100
target-version = "py311"
exclude = ["alembic"]
ignore = ["E501"]

0 comments on commit ad653de

Please sign in to comment.