From 8daa54443de01a8246c62db3dd1dfff27606700f Mon Sep 17 00:00:00 2001 From: Radi Date: Thu, 20 Feb 2025 16:33:38 +0100 Subject: [PATCH 1/8] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix=20typo=20in=20`dat?= =?UTF-8?q?abases.md`=20(#1113)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update databases.md typo fix Co-authored-by: Sofie Van Landeghem --- docs/databases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/databases.md b/docs/databases.md index d65a743..0f99f45 100644 --- a/docs/databases.md +++ b/docs/databases.md @@ -66,7 +66,7 @@ There are many databases of many types. ### A single file database -A database could be a single file called `heroes.db`, managed with code in a very efficient way. An example would be SQLite, more about that on a bit. +A database could be a single file called `heroes.db`, managed with code in a very efficient way. An example would be SQLite, more about that in a bit. ![database as a single file](img/databases/single-file.svg) From ee16ba4dc327ac343c55ebbc9fa9234385b74b2b Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 20 Feb 2025 15:34:01 +0000 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=93=9D=20Update=20release=20notes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- docs/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index 98bbe24..c341c54 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -8,6 +8,7 @@ ### Docs +* ✏️ Fix typo in `databases.md`. PR [#1113](https://github.com/fastapi/sqlmodel/pull/1113) by [@radi-dev](https://github.com/radi-dev). * ✏️ Fix typo in `docs/tutorial/create-db-and-table.md`. PR [#1252](https://github.com/fastapi/sqlmodel/pull/1252) by [@ArianHamdi](https://github.com/ArianHamdi). * ✏️ Fix typo in `insert.md`. PR [#1256](https://github.com/fastapi/sqlmodel/pull/1256) by [@Noushadaliam](https://github.com/Noushadaliam). * 📝 Update markdown includes format. PR [#1254](https://github.com/fastapi/sqlmodel/pull/1254) by [@tiangolo](https://github.com/tiangolo). From 759220d5928af4a01c205a039eb9826456a475cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Fri, 21 Feb 2025 12:59:48 +0100 Subject: [PATCH 3/8] =?UTF-8?q?=20=F0=9F=91=B7=20Add=20Codecov=20to=20CI,?= =?UTF-8?q?=20Smokeshow/Cloudflare=20has=20been=20flaky=20lately=20(#1303)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 10 ++++++++++ scripts/test.sh | 1 + 2 files changed, 11 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9126db9..c924e54 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,13 +74,23 @@ jobs: env: COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }} CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }} + # TODO: if removing Smokeshow, and moving only to Codecov, remove this + # Upload files before running Codecov, as it generates an extra file coverage/coverage.xml, and that breaks coverage-combine - name: Store coverage files uses: actions/upload-artifact@v4 with: name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }} path: coverage include-hidden-files: true + - uses: codecov/codecov-action@v5 + with: + fail_ci_if_error: true + files: ./coverage.xml + name: codecov-umbrella + token: ${{ secrets.CODECOV_TOKEN }} + verbose: true + # TODO: if removing Smokeshow, and moving only to Codecov, remove this coverage-combine: needs: - test diff --git a/scripts/test.sh b/scripts/test.sh index ff4b114..826ae90 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -7,3 +7,4 @@ coverage run -m pytest tests coverage combine coverage report coverage html +coverage xml From b8ded9b9ca0c1b6d1267008a7e1169d484ddd30c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 21 Feb 2025 12:00:05 +0000 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=93=9D=20Update=20release=20notes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- docs/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index c341c54..60f2c5a 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -22,6 +22,7 @@ ### Internal +* 👷 Add Codecov to CI, Smokeshow/Cloudflare has been flaky lately. PR [#1303](https://github.com/fastapi/sqlmodel/pull/1303) by [@tiangolo](https://github.com/tiangolo). * 👷 Add retries to Smokeshow. PR [#1302](https://github.com/fastapi/sqlmodel/pull/1302) by [@svlandeg](https://github.com/svlandeg). * ⬆ Bump astral-sh/setup-uv from 4 to 5. PR [#1249](https://github.com/fastapi/sqlmodel/pull/1249) by [@dependabot[bot]](https://github.com/apps/dependabot). * ⬆ Bump pillow from 10.3.0 to 11.0.0. PR [#1139](https://github.com/fastapi/sqlmodel/pull/1139) by [@dependabot[bot]](https://github.com/apps/dependabot). From a1fdc57271da1993a79587ecde12a5cb5b2255f3 Mon Sep 17 00:00:00 2001 From: Sofie Van Landeghem Date: Fri, 21 Feb 2025 15:45:27 +0100 Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=91=B7=20Revert=20"Add=20Codecov=20to?= =?UTF-8?q?=20CI,=20Smokeshow/Cloudflare=20has=20been=20flaky=20lately=20(?= =?UTF-8?q?#1303)"=20(#1306)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert " 👷 Add Codecov to CI, Smokeshow/Cloudflare has been flaky lately (#1303)" This reverts commit 759220d5928af4a01c205a039eb9826456a475cd. --- .github/workflows/test.yml | 10 ---------- scripts/test.sh | 1 - 2 files changed, 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c924e54..9126db9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,23 +74,13 @@ jobs: env: COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }} CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }} - # TODO: if removing Smokeshow, and moving only to Codecov, remove this - # Upload files before running Codecov, as it generates an extra file coverage/coverage.xml, and that breaks coverage-combine - name: Store coverage files uses: actions/upload-artifact@v4 with: name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }} path: coverage include-hidden-files: true - - uses: codecov/codecov-action@v5 - with: - fail_ci_if_error: true - files: ./coverage.xml - name: codecov-umbrella - token: ${{ secrets.CODECOV_TOKEN }} - verbose: true - # TODO: if removing Smokeshow, and moving only to Codecov, remove this coverage-combine: needs: - test diff --git a/scripts/test.sh b/scripts/test.sh index 826ae90..ff4b114 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -7,4 +7,3 @@ coverage run -m pytest tests coverage combine coverage report coverage html -coverage xml From 8a35352bc56d3667b2b7f3697df858f50c7145c4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 21 Feb 2025 14:45:48 +0000 Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=93=9D=20Update=20release=20notes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- docs/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index 60f2c5a..486c0b2 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -22,6 +22,7 @@ ### Internal +* 👷 Revert "Add Codecov to CI, Smokeshow/Cloudflare has been flaky lately (#1303)". PR [#1306](https://github.com/fastapi/sqlmodel/pull/1306) by [@svlandeg](https://github.com/svlandeg). * 👷 Add Codecov to CI, Smokeshow/Cloudflare has been flaky lately. PR [#1303](https://github.com/fastapi/sqlmodel/pull/1303) by [@tiangolo](https://github.com/tiangolo). * 👷 Add retries to Smokeshow. PR [#1302](https://github.com/fastapi/sqlmodel/pull/1302) by [@svlandeg](https://github.com/svlandeg). * ⬆ Bump astral-sh/setup-uv from 4 to 5. PR [#1249](https://github.com/fastapi/sqlmodel/pull/1249) by [@dependabot[bot]](https://github.com/apps/dependabot). From ac9d1a514a144ad3fa6ca422dcbbe1bf2d0796fc Mon Sep 17 00:00:00 2001 From: Sofie Van Landeghem Date: Mon, 24 Feb 2025 10:18:24 +0100 Subject: [PATCH 7/8] =?UTF-8?q?=F0=9F=92=9A=20Fix=20CI=20test=20suite=20fo?= =?UTF-8?q?r=20Python=203.7=20(#1309)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9126db9..19e6961 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,9 +23,9 @@ env: jobs: test: - runs-on: ubuntu-latest strategy: matrix: + os: [ ubuntu-latest ] python-version: - "3.8" - "3.9" @@ -35,7 +35,15 @@ jobs: pydantic-version: - pydantic-v1 - pydantic-v2 + include: + - os: ubuntu-22.04 + python-version: "3.7" + pydantic-version: pydantic-v1 + - os: ubuntu-22.04 + python-version: "3.7" + pydantic-version: pydantic-v2 fail-fast: false + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - name: Set up Python From ce22f2a50b485b81185b6d4b2873cbd4eb7af65b Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 24 Feb 2025 09:18:56 +0000 Subject: [PATCH 8/8] =?UTF-8?q?=F0=9F=93=9D=20Update=20release=20notes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] --- docs/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index 486c0b2..f03d193 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -22,6 +22,7 @@ ### Internal +* 💚 Fix CI test suite for Python 3.7. PR [#1309](https://github.com/fastapi/sqlmodel/pull/1309) by [@svlandeg](https://github.com/svlandeg). * 👷 Revert "Add Codecov to CI, Smokeshow/Cloudflare has been flaky lately (#1303)". PR [#1306](https://github.com/fastapi/sqlmodel/pull/1306) by [@svlandeg](https://github.com/svlandeg). * 👷 Add Codecov to CI, Smokeshow/Cloudflare has been flaky lately. PR [#1303](https://github.com/fastapi/sqlmodel/pull/1303) by [@tiangolo](https://github.com/tiangolo). * 👷 Add retries to Smokeshow. PR [#1302](https://github.com/fastapi/sqlmodel/pull/1302) by [@svlandeg](https://github.com/svlandeg).