Skip to content

Commit acd753e

Browse files
mskripmskrip
authored
Merge branch 'main' into main
2 parents 29ee43d + 9550bb9 commit acd753e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2142
-538
lines changed

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ contact_links:
44
about: Please report security vulnerabilities to [email protected]
55
- name: Question or Problem
66
about: Ask a question or ask about a problem in GitHub Discussions.
7-
url: https://github.com/tiangolo/sqlmodel/discussions/categories/questions
7+
url: https://github.com/fastapi/sqlmodel/discussions/categories/questions
88
- name: Feature Request
99
about: To suggest an idea or ask about a feature, please start with a question saying what you would like to achieve. There might be a way to do it already.
10-
url: https://github.com/tiangolo/sqlmodel/discussions/categories/questions
10+
url: https://github.com/fastapi/sqlmodel/discussions/categories/questions
1111
- name: Show and tell
1212
about: Show what you built with SQLModel or to be used with SQLModel.
13-
url: https://github.com/tiangolo/sqlmodel/discussions/categories/show-and-tell
13+
url: https://github.com/fastapi/sqlmodel/discussions/categories/show-and-tell

‎.github/ISSUE_TEMPLATE/privileged.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
value: |
77
Thanks for your interest in SQLModel! 🚀
88
9-
If you are not @tiangolo or he didn't ask you directly to create an issue here, please start the conversation in a [Question in GitHub Discussions](https://github.com/tiangolo/sqlmodel/discussions/categories/questions) instead.
9+
If you are not @tiangolo or he didn't ask you directly to create an issue here, please start the conversation in a [Question in GitHub Discussions](https://github.com/fastapi/sqlmodel/discussions/categories/questions) instead.
1010
- type: checkboxes
1111
id: privileged
1212
attributes:

‎.github/labeler.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
docs:
2+
- all:
3+
- changed-files:
4+
- any-glob-to-any-file:
5+
- docs/**
6+
- docs_src/**
7+
- all-globs-to-all-files:
8+
- '!sqlmodel/**'
9+
- '!pyproject.toml'
10+
11+
internal:
12+
- all:
13+
- changed-files:
14+
- any-glob-to-any-file:
15+
- .github/**
16+
- scripts/**
17+
- .gitignore
18+
- .pre-commit-config.yaml
19+
- pdm_build.py
20+
- requirements*.txt
21+
- all-globs-to-all-files:
22+
- '!docs/**'
23+
- '!sqlmodel/**'
24+
- '!pyproject.toml'

‎.github/workflows/add-to-project.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Add to Project
2+
3+
on:
4+
pull_request_target:
5+
issues:
6+
types:
7+
- opened
8+
- reopened
9+
10+
jobs:
11+
add-to-project:
12+
name: Add to project
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/[email protected]
16+
with:
17+
project-url: https://github.com/orgs/fastapi/projects/2
18+
github-token: ${{ secrets.PROJECTS_TOKEN }}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ jobs:
7777
with:
7878
name: docs-site
7979
path: ./site/**
80+
include-hidden-files: true
8081

8182
# https://github.com/marketplace/actions/alls-green#why
8283
docs-all-green: # This job does nothing and is only used for the branch protection

‎.github/workflows/issue-manager.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Issue Manager
22

33
on:
44
schedule:
5-
- cron: "11 4 * * *"
5+
- cron: "13 18 * * *"
66
issue_comment:
77
types:
88
- created
@@ -16,10 +16,11 @@ on:
1616

1717
permissions:
1818
issues: write
19+
pull-requests: write
1920

2021
jobs:
2122
issue-manager:
22-
if: github.repository_owner == 'tiangolo'
23+
if: github.repository_owner == 'fastapi'
2324
runs-on: ubuntu-latest
2425
steps:
2526
- name: Dump GitHub context
@@ -35,8 +36,8 @@ jobs:
3536
"delay": 864000,
3637
"message": "Assuming the original need was handled, this will be automatically closed now. But feel free to add more comments or create new issues or PRs."
3738
},
38-
"changes-requested": {
39+
"waiting": {
3940
"delay": 2628000,
40-
"message": "As this PR had requested changes to be applied but has been inactive for a while, it's now going to be closed. But if there's anyone interested, feel free to create a new PR."
41+
"message": "As this PR has been waiting for the original user for a while but seems to be inactive, it's now going to be closed. But if there's anyone interested, feel free to create a new PR."
4142
}
4243
}

‎.github/workflows/labeler.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Labels
2+
on:
3+
pull_request_target:
4+
types:
5+
- opened
6+
- synchronize
7+
- reopened
8+
# For label-checker
9+
- labeled
10+
- unlabeled
11+
12+
jobs:
13+
labeler:
14+
permissions:
15+
contents: read
16+
pull-requests: write
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/labeler@v5
20+
# Run this after labeler applied labels
21+
check-labels:
22+
needs:
23+
- labeler
24+
permissions:
25+
pull-requests: read
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: docker://agilepathway/pull-request-label-checker:latest
29+
with:
30+
one_of: breaking,security,feature,bug,refactor,upgrade,docs,lang-all,internal
31+
repo_token: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ jobs:
3030
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'true' }}
3131
with:
3232
limit-access-to-actor: true
33-
- uses: docker://tiangolo/latest-changes:0.2.0
34-
# - uses: tiangolo/latest-changes@main
33+
- uses: tiangolo/[email protected]
3534
with:
3635
token: ${{ secrets.GITHUB_TOKEN }}
3736
latest_changes_file: docs/release-notes.md

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,15 @@ jobs:
6969
- name: Test
7070
run: bash scripts/test.sh
7171
env:
72-
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
72+
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
7373
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
7474
- name: Store coverage files
7575
uses: actions/upload-artifact@v4
7676
with:
7777
name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
7878
path: coverage
79+
include-hidden-files: true
80+
7981
coverage-combine:
8082
needs:
8183
- test
@@ -86,7 +88,7 @@ jobs:
8688

8789
- uses: actions/setup-python@v5
8890
with:
89-
python-version: '3.8'
91+
python-version: '3.12'
9092

9193
- name: Get coverage files
9294
uses: actions/download-artifact@v4
@@ -100,13 +102,14 @@ jobs:
100102
- run: ls -la coverage
101103
- run: coverage combine coverage
102104
- run: coverage report
103-
- run: coverage html --show-contexts --title "Coverage for ${{ github.sha }}"
105+
- run: coverage html --title "Coverage for ${{ github.sha }}"
104106

105107
- name: Store coverage HTML
106108
uses: actions/upload-artifact@v4
107109
with:
108110
name: coverage-html
109111
path: htmlcov
112+
include-hidden-files: true
110113

111114
# https://github.com/marketplace/actions/alls-green#why
112115
alls-green: # This job does nothing and is only used for the branch protection

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
*.pyc
2-
env*
32
.mypy_cache
43
.vscode
54
.idea
@@ -12,3 +11,4 @@ coverage.xml
1211
site
1312
*.db
1413
.cache
14+
.venv*

0 commit comments

Comments
 (0)