Skip to content

Commit

Permalink
Merge branch 'pydantic:main' into isbn_doc
Browse files Browse the repository at this point in the history
  • Loading branch information
yezz123 committed Jan 9, 2024
2 parents 9320f83 + dc7d01a commit 3e0d961
Show file tree
Hide file tree
Showing 26 changed files with 255 additions and 1,293 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ jobs:
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-with-deps

- name: store coverage files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage
name: coverage-${{ matrix.os }}-${{ matrix.python-version }}
path: coverage

test-fastapi:
Expand All @@ -169,7 +169,7 @@ jobs:
- uses: actions/checkout@v4

- name: set up python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand Down Expand Up @@ -270,9 +270,9 @@ jobs:
CONTEXT: linux-py${{ matrix.python-version }}-pyright

- name: store coverage files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage
name: coverage-${{ matrix.os }}-${{ matrix.python-version }}-mypy${{ matrix.mypy-version }}
path: coverage

coverage-combine:
Expand All @@ -282,14 +282,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.8'

- name: get coverage files
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: coverage
merge-multiple: true
pattern: coverage-*
path: coverage

- run: pip install coverage[toml]
Expand All @@ -300,7 +301,7 @@ jobs:
- run: coverage html --show-contexts --title "pydantic coverage for ${{ github.sha }}"

- name: Store coverage html
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-html
path: htmlcov
Expand Down Expand Up @@ -382,7 +383,7 @@ jobs:
- uses: actions/checkout@v4

- name: set up python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand All @@ -408,7 +409,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- uses: actions/checkout@v4

- name: set up python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upload-previews.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'

- run: pip install smokeshow

- uses: dawidd6/action-download-artifact@v2
- uses: dawidd6/action-download-artifact@v3
with:
workflow: ci.yml
commit: ${{ github.event.workflow_run.head_sha }}
Expand Down
200 changes: 0 additions & 200 deletions docs/blog/pydantic-v2-alpha.md

This file was deleted.

40 changes: 0 additions & 40 deletions docs/blog/pydantic-v2-final.md

This file was deleted.

0 comments on commit 3e0d961

Please sign in to comment.