Skip to content

Commit

Permalink
fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
visch committed Feb 22, 2024
2 parents 0b07d39 + d53d7c4 commit c84d384
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.0
rev: v0.2.2
hooks:
- id: ruff
args: [--fix]
Expand Down
78 changes: 39 additions & 39 deletions poetry.lock

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

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ license = "Apache-2.0"
[tool.poetry.dependencies]
python = ">=3.8"
fs-s3fs = { version = "==1.1.1", optional = true }
singer-sdk = { version="~=0.35.0" }
singer-sdk = { version="~=0.35.2" }
pymysql = "==1.1.0"
sqlalchemy = "<2"
sshtunnel = "0.4.0"

# Binary client for MySQL
mysqlclient = { version = "==2.2.3", optional = true }
mysqlclient = { version = "==2.2.4", optional = true }

[tool.poetry.group.dev.dependencies]
faker = ">=20"
pytest = ">=7.3.2"
singer-sdk = { version="~=0.35.0", extras = ["testing"] }
singer-sdk = { version="~=0.35.2", extras = ["testing"] }
remote-pdb=">=2.1.0"

[tool.poetry.group.typing.dependencies]
Expand Down

0 comments on commit c84d384

Please sign in to comment.