Skip to content

Commit

Permalink
Merge branch 'main' into atar-split-backends
Browse files Browse the repository at this point in the history
  • Loading branch information
atarashansky authored May 29, 2024
2 parents a40c76f + d2a0988 commit 6d57a0c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-images-and-create-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
uses: avakar/create-deployment@v1
# To stop deployment to a specific DEPLOYMENT_STAGE remove it from condition below.
# The DEPLOYMENT_STAGE that should be present are dev, stage, prod.
if: env.DEPLOYMENT_STAGE == 'prod' || env.DEPLOYMENT_STAGE == 'stage' || env.DEPLOYMENT_STAGE == 'dev'
if: env.DEPLOYMENT_STAGE == 'prod' || env.DEPLOYMENT_STAGE == 'stage'
with:
auto_merge: false
environment: ${{ env.DEPLOYMENT_STAGE }}
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 24.3.0 # Must be kept in sync with black version in python_dependencies/common/requirements.txt
rev: 24.4.2 # Must be kept in sync with black version in python_dependencies/common/requirements.txt
hooks:
- id: black
stages: [commit]
Expand All @@ -14,7 +14,7 @@ repos:
exclude_types: ["json"]

- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.4.3 # Must be kept in sync with ruff version in python_dependencies/common/requirements.txt
rev: v0.4.4 # Must be kept in sync with ruff version in python_dependencies/common/requirements.txt
hooks:
- id: ruff
args: ["--config=pyproject.toml", "--fix"]
Expand Down
2 changes: 0 additions & 2 deletions python_dependencies/common/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
allure-pytest<3
black==24.3.0 # Must be kept in sync with black version in .pre-commit-config.yaml
click
coverage
parameterized
pytest
pytest-mock
pytest-subtests
ruff==0.4.3 # Must be kept in sync with ruff version in .pre-commit-config.yaml

0 comments on commit 6d57a0c

Please sign in to comment.