Skip to content

Commit

Permalink
Merge branch 'main' into actually-making-client-update-works
Browse files Browse the repository at this point in the history
  • Loading branch information
lotif authored Nov 27, 2024
2 parents 6b24b30 + 3cc970e commit 3da12ea
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 114 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/integration_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- '**.ipynb'
- poetry.lock
- pyproject.toml
- yarn.lock
- '**.rst'
- '**.md'
pull_request:
Expand All @@ -31,6 +32,7 @@ on:
- '**.ipynb'
- poetry.lock
- pyproject.toml
- yarn.lock
- '**.rst'
- '**.md'

Expand Down Expand Up @@ -62,7 +64,7 @@ jobs:
poetry install --with docs,test
coverage run -m pytest florist/tests/integration && coverage xml && coverage report -m
- name: Upload python coverage to Codecov
uses: Wandalen/[email protected].2
uses: Wandalen/[email protected].3
with:
action: codecov/[email protected]
with: |
Expand All @@ -73,14 +75,15 @@ jobs:
attempt_delay: 30000

# TODO enable this once we have integration tests for the UI
#
# - name: Setup yarn
# uses: mskelton/setup-yarn@v1
# - name: Install nextjs dependencies and check code
# run: |
# yarn
# yarn integration-test
# - name: Upload js coverage to Codecov
# uses: Wandalen/[email protected].2
# uses: Wandalen/[email protected].3
# with:
# action: codecov/[email protected]
# with: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/unit_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
- '**.tsx'
- poetry.lock
- pyproject.toml
- yarn.lock
- '**.rst'
- '**.md'
pull_request:
Expand All @@ -33,6 +34,7 @@ on:
- '**.tsx'
- poetry.lock
- pyproject.toml
- yarn.lock
- '**.rst'
- '**.md'

Expand All @@ -56,7 +58,7 @@ jobs:
poetry install --with docs,test
coverage run -m pytest florist/tests/unit && coverage xml && coverage report -m
- name: Upload python coverage to Codecov
uses: Wandalen/[email protected].2
uses: Wandalen/[email protected].3
with:
action: codecov/[email protected]
with: |
Expand All @@ -72,7 +74,7 @@ jobs:
yarn
yarn unit-test
- name: Upload js coverage to Codecov
uses: Wandalen/[email protected].2
uses: Wandalen/[email protected].3
with:
action: codecov/[email protected]
with: |
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repos:
- id: check-toml

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.7.3'
rev: 'v0.8.0'
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
Loading

0 comments on commit 3da12ea

Please sign in to comment.