Skip to content

Commit 72735d7

Browse files
tiangolotiangolo
authored
Merge branch 'main' into byrman_fix2-issue-315
2 parents 2d6e7a1 + c31bac6 commit 72735d7

File tree

15 files changed

+122
-36
lines changed

15 files changed

+122
-36
lines changed

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ updates:
55
directory: "/"
66
schedule:
77
interval: "daily"
8+
commit-message:
9+
prefix: ⬆
810
# Python
911
- package-ecosystem: "pip"
1012
directory: "/"
1113
schedule:
1214
interval: "daily"
15+
commit-message:
16+
prefix: ⬆

‎.github/workflows/build-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
env:
2020
GITHUB_CONTEXT: ${{ toJson(github) }}
2121
run: echo "$GITHUB_CONTEXT"
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3.1.0
2323
- name: Set up Python
24-
uses: actions/setup-python@v2
24+
uses: actions/setup-python@v4
2525
with:
2626
python-version: "3.7"
2727
# Allow debugging with tmate
@@ -65,7 +65,7 @@ jobs:
6565
run: python -m poetry run mkdocs build --config-file mkdocs.insiders.yml
6666
- name: Zip docs
6767
run: python -m poetry run bash ./scripts/zip-docs.sh
68-
- uses: actions/upload-artifact@v2
68+
- uses: actions/upload-artifact@v3
6969
with:
7070
name: docs-zip
7171
path: ./docs.zip

‎.github/workflows/latest-changes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
latest-changes:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v3.1.0
2424
with:
2525
# To allow latest-changes to commit to the main branch
2626
token: ${{ secrets.ACTIONS_TOKEN }}

‎.github/workflows/preview-docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
preview-docs:
1111
runs-on: ubuntu-20.04
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3.1.0
1414
- name: Download Artifact Docs
15-
uses: dawidd6/action-download-artifact@v2.9.0
15+
uses: dawidd6/action-download-artifact@v2.24.2
1616
with:
1717
github_token: ${{ secrets.GITHUB_TOKEN }}
1818
workflow: build-docs.yml

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
publish:
1616
runs-on: ubuntu-20.04
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3.1.0
1919
- name: Set up Python
20-
uses: actions/setup-python@v2
20+
uses: actions/setup-python@v4
2121
with:
2222
python-version: "3.7"
2323
# Allow debugging with tmate

‎.github/workflows/smokeshow.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Smokeshow
2+
3+
on:
4+
workflow_run:
5+
workflows: [Test]
6+
types: [completed]
7+
8+
permissions:
9+
statuses: write
10+
11+
jobs:
12+
smokeshow:
13+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.9'
20+
21+
- run: pip install smokeshow
22+
23+
- uses: dawidd6/action-download-artifact@v2.24.2
24+
with:
25+
workflow: test.yml
26+
commit: ${{ github.event.workflow_run.head_sha }}
27+
28+
- run: smokeshow upload coverage-html
29+
env:
30+
SMOKESHOW_GITHUB_STATUS_DESCRIPTION: Coverage {coverage-percentage}
31+
SMOKESHOW_GITHUB_COVERAGE_THRESHOLD: 95
32+
SMOKESHOW_GITHUB_CONTEXT: coverage
33+
SMOKESHOW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
SMOKESHOW_GITHUB_PR_HEAD_SHA: ${{ github.event.workflow_run.head_sha }}
35+
SMOKESHOW_AUTH_KEY: ${{ secrets.SMOKESHOW_AUTH_KEY }}

‎.github/workflows/test.yml‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
fail-fast: false
2323

2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3.1.0
2626
- name: Set up Python
27-
uses: actions/setup-python@v2
27+
uses: actions/setup-python@v4
2828
with:
2929
python-version: ${{ matrix.python-version }}
3030
# Allow debugging with tmate
@@ -56,7 +56,43 @@ jobs:
5656
- name: Lint
5757
if: ${{ matrix.python-version != '3.6.15' }}
5858
run: python -m poetry run bash scripts/lint.sh
59+
- run: mkdir coverage
5960
- name: Test
6061
run: python -m poetry run bash scripts/test.sh
61-
- name: Upload coverage
62-
uses: codecov/codecov-action@v2
62+
env:
63+
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
64+
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
65+
- name: Store coverage files
66+
uses: actions/upload-artifact@v3
67+
with:
68+
name: coverage
69+
path: coverage
70+
coverage-combine:
71+
needs: [test]
72+
runs-on: ubuntu-latest
73+
74+
steps:
75+
- uses: actions/checkout@v3
76+
77+
- uses: actions/setup-python@v4
78+
with:
79+
python-version: '3.8'
80+
81+
- name: Get coverage files
82+
uses: actions/download-artifact@v3
83+
with:
84+
name: coverage
85+
path: coverage
86+
87+
- run: pip install coverage[toml]
88+
89+
- run: ls -la coverage
90+
- run: coverage combine coverage
91+
- run: coverage report
92+
- run: coverage html --show-contexts --title "Coverage for ${{ github.sha }}"
93+
94+
- name: Store coverage HTML
95+
uses: actions/upload-artifact@v3
96+
with:
97+
name: coverage-html
98+
path: htmlcov

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
<a href="https://github.com/tiangolo/sqlmodel/actions?query=workflow%3APublish" target="_blank">
1212
<img src="https://github.com/tiangolo/sqlmodel/workflows/Publish/badge.svg" alt="Publish">
1313
</a>
14-
<a href="https://codecov.io/gh/tiangolo/sqlmodel" target="_blank">
15-
<img src="https://img.shields.io/codecov/c/github/tiangolo/sqlmodel?color=%2334D058" alt="Coverage">
16-
</a>
14+
<a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/tiangolo/sqlmodel" target="_blank">
15+
<img src="https://coverage-badge.samuelcolvin.workers.dev/tiangolo/sqlmodel.svg" alt="Coverage">
1716
<a href="https://pypi.org/project/sqlmodel" target="_blank">
1817
<img src="https://img.shields.io/pypi/v/sqlmodel?color=%2334D058&label=pypi%20package" alt="Package version">
1918
</a>

‎docs/index.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
<a href="https://github.com/tiangolo/sqlmodel/actions?query=workflow%3APublish" target="_blank">
1212
<img src="https://github.com/tiangolo/sqlmodel/workflows/Publish/badge.svg" alt="Publish">
1313
</a>
14-
<a href="https://codecov.io/gh/tiangolo/sqlmodel" target="_blank">
15-
<img src="https://img.shields.io/codecov/c/github/tiangolo/sqlmodel?color=%2334D058" alt="Coverage">
16-
</a>
14+
<a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/tiangolo/sqlmodel" target="_blank">
15+
<img src="https://coverage-badge.samuelcolvin.workers.dev/tiangolo/sqlmodel.svg" alt="Coverage">
1716
<a href="https://pypi.org/project/sqlmodel" target="_blank">
1817
<img src="https://img.shields.io/pypi/v/sqlmodel?color=%2334D058&label=pypi%20package" alt="Package version">
1918
</a>

‎docs/release-notes.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22

33
## Latest Changes
44

5+
* ⬆ Bump dawidd6/action-download-artifact from 2.24.0 to 2.24.2. PR [#493](https://github.com/tiangolo/sqlmodel/pull/493) by [@dependabot[bot]](https://github.com/apps/dependabot).
6+
* ✏️ Fix typo in `docs/tutorial/create-db-and-table.md`. PR [#477](https://github.com/tiangolo/sqlmodel/pull/477) by [@FluffyDietEngine](https://github.com/FluffyDietEngine).
7+
* ✏️ Fix small typos in docs. PR [#481](https://github.com/tiangolo/sqlmodel/pull/481) by [@micuffaro](https://github.com/micuffaro).
8+
* 🔧 Update Smokeshow coverage threshold. PR [#487](https://github.com/tiangolo/sqlmodel/pull/487) by [@tiangolo](https://github.com/tiangolo).
9+
* 👷 Move from Codecov to Smokeshow. PR [#486](https://github.com/tiangolo/sqlmodel/pull/486) by [@tiangolo](https://github.com/tiangolo).
10+
* ⬆ Bump actions/setup-python from 2 to 4. PR [#411](https://github.com/tiangolo/sqlmodel/pull/411) by [@dependabot[bot]](https://github.com/apps/dependabot).
11+
* ⬆ Update black requirement from ^21.5-beta.1 to ^22.10.0. PR [#460](https://github.com/tiangolo/sqlmodel/pull/460) by [@dependabot[bot]](https://github.com/apps/dependabot).
12+
* ➕ Add extra dev dependencies for MkDocs Material. PR [#485](https://github.com/tiangolo/sqlmodel/pull/485) by [@tiangolo](https://github.com/tiangolo).
13+
* ⬆ Update mypy requirement from 0.930 to 0.971. PR [#380](https://github.com/tiangolo/sqlmodel/pull/380) by [@dependabot[bot]](https://github.com/apps/dependabot).
14+
* ⬆ Update coverage requirement from ^5.5 to ^6.2. PR [#171](https://github.com/tiangolo/sqlmodel/pull/171) by [@dependabot[bot]](https://github.com/apps/dependabot).
15+
* ⬆ Bump codecov/codecov-action from 2 to 3. PR [#415](https://github.com/tiangolo/sqlmodel/pull/415) by [@dependabot[bot]](https://github.com/apps/dependabot).
16+
* ⬆ Bump actions/upload-artifact from 2 to 3. PR [#412](https://github.com/tiangolo/sqlmodel/pull/412) by [@dependabot[bot]](https://github.com/apps/dependabot).
17+
* ⬆ Update flake8 requirement from ^3.9.2 to ^5.0.4. PR [#396](https://github.com/tiangolo/sqlmodel/pull/396) by [@dependabot[bot]](https://github.com/apps/dependabot).
18+
* ⬆ Update pytest requirement from ^6.2.4 to ^7.0.1. PR [#242](https://github.com/tiangolo/sqlmodel/pull/242) by [@dependabot[bot]](https://github.com/apps/dependabot).
19+
* ⬆ Bump actions/checkout from 2 to 3.1.0. PR [#458](https://github.com/tiangolo/sqlmodel/pull/458) by [@dependabot[bot]](https://github.com/apps/dependabot).
20+
* ⬆ Bump dawidd6/action-download-artifact from 2.9.0 to 2.24.0. PR [#470](https://github.com/tiangolo/sqlmodel/pull/470) by [@dependabot[bot]](https://github.com/apps/dependabot).
21+
* 👷 Update Dependabot config. PR [#484](https://github.com/tiangolo/sqlmodel/pull/484) by [@tiangolo](https://github.com/tiangolo).
522

623
## 0.0.8
724

0 commit comments

Comments
 (0)