Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into adapt-service-locator
Browse files Browse the repository at this point in the history
  • Loading branch information
janbuchar committed Jan 8, 2025
2 parents 6bb2e59 + d66265c commit e5408c6
Show file tree
Hide file tree
Showing 3 changed files with 1,560 additions and 3,644 deletions.
65 changes: 33 additions & 32 deletions poetry.lock

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

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pytest-timeout = "~2.3.0"
pytest-xdist = "~3.6.0"
respx = "~0.22.0"
ruff = "~0.8.0"
setuptools = "~75.6.0" # setuptools are used by pytest but not explicitly required
setuptools = "~75.7.0" # setuptools are used by pytest but not explicitly required

[tool.poetry.extras]
scrapy = ["scrapy"]
Expand Down
Loading

0 comments on commit e5408c6

Please sign in to comment.