Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/pip/certifi-2024.7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
danielfromearth authored Jul 10, 2024
2 parents 698d037 + 0c4c8bc commit 6671239
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:
- name: Build and push Docker image
if: ${{ !startsWith(github.ref, 'refs/heads/main/') }}
id: docker-push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Lint
run: |
poetry run ruff batcher
poetry run ruff check batcher
- name: Run tests with coverage
run: |
Expand Down
95 changes: 48 additions & 47 deletions poetry.lock

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

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "batchee"
version = "1.2.0"
version = "1.3.0a2"
description = "Determine how to group together input files into batches for subsequent concatenation"
authors = ["Daniel Kaufman <[email protected]>"]
readme = "README.md"
Expand All @@ -21,7 +21,7 @@ batchee = 'batcher.tempo_filename_parser:main'

[tool.poetry.group.dev.dependencies]
coverage = "^7.4.4"
ruff = "^0.4.1"
ruff = ">=0.4.1,<0.6.0"
pytest = "^8.1.1"
black = "^24.4.0"
mypy = "^1.9.0"
Expand Down

0 comments on commit 6671239

Please sign in to comment.