Skip to content

Commit

Permalink
Merge branch 'main' into refactor/otaclient_config
Browse files Browse the repository at this point in the history
  • Loading branch information
Bodong-Yang authored Oct 18, 2024
2 parents a3bd960 + 40a6291 commit 39f2d59
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/gen_requirements_txt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
token: ${{ secrets.GITHUB_TOKEN }}
# use repo scope deploy key for the later git operations, so that the pushed commit can trigger the
# workflow as expected. The default action token GITHUB_TOKEN cannot trigger new workflows.
# For more details about this restriction, please refer to:
# https://github.com/peter-evans/create-pull-request/issues/48 and
# https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs
ssh_key: ${{ secrets.DEPLOY_KEY }}
persist-credentials: true

- name: setup python
uses: actions/setup-python@v4
Expand All @@ -44,5 +50,3 @@ jobs:
git commit -m "[GHA] Update requirements.txt on pyproject.toml changed"
git push
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10 changes: 9 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ on:
pull_request:
branches:
- main
types:
- opened
- synchronize
- reopened
# NOTE(20241016): this is a workaround for PR with head
# updated by gen_requirements_txt workflow
- review_requested
- assigned
push:
branches:
- main
Expand Down Expand Up @@ -48,7 +56,7 @@ jobs:
# export the coverage report to the comment!
- name: Add coverage report to PR comment
continue-on-error: true
uses: MishaKav/[email protected].52
uses: MishaKav/[email protected].53
with:
pytest-xml-coverage-path: test_result/coverage.xml
junitxml-path: test_result/pytest.xml
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ dynamic = [
]
dependencies = [
"aiofiles<25,>=24.1",
"aiohttp>=3.9.5,<3.11",
"cryptography>=42.0.4,<44",
"aiohttp>=3.10.2,<3.11",
"cryptography>=43.0.1,<44",
"grpcio>=1.53.2,<1.67",
"protobuf<4.22,>=4.21.12",
"pydantic<3,>=2.6",
Expand All @@ -37,7 +37,7 @@ dependencies = [
"simple-sqlite3-orm<0.3,>=0.2",
"typing-extensions>=4.6.3",
"urllib3<2.3,>=2.2.2",
"uvicorn[standard]<0.31,>=0.30",
"uvicorn[standard]>=0.30,<0.32",
"zstandard<0.24,>=0.22",
]
optional-dependencies.dev = [
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Automatically generated from pyproject.toml by gen_requirements_txt.py script.
# DO NOT EDIT! Only for reference use.
aiofiles<25,>=24.1
aiohttp>=3.9.5,<3.11
cryptography>=42.0.4,<44
aiohttp>=3.10.2,<3.11
cryptography>=43.0.1,<44
grpcio>=1.53.2,<1.67
protobuf<4.22,>=4.21.12
pydantic<3,>=2.6
Expand All @@ -13,5 +13,5 @@ requests<2.33,>=2.32
simple-sqlite3-orm<0.3,>=0.2
typing-extensions>=4.6.3
urllib3<2.3,>=2.2.2
uvicorn[standard]<0.31,>=0.30
uvicorn[standard]>=0.30,<0.32
zstandard<0.24,>=0.22

0 comments on commit 39f2d59

Please sign in to comment.