-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into string-null-fix
- Loading branch information
Showing
114 changed files
with
4,997 additions
and
3,854 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
root = true | ||
|
||
[*] | ||
indent_style = space | ||
indent_size = 4 | ||
insert_final_newline = true | ||
trim_trailing_whitespace = true | ||
end_of_line = lf | ||
charset = utf-8 | ||
max_line_length = 88 | ||
|
||
[*.{css,html,js,json,jsx,scss,ts,tsx,yaml,yml}] | ||
indent_size = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
--- | ||
name: Bug report | ||
about: Report a bug in Flask-Admin (not other projects which depend on Flask-Admin) | ||
--- | ||
|
||
<!-- | ||
This issue tracker is a tool to address bugs in Flask-Admin itself. | ||
Please use GitHub Discussions or the Pallets Discord for questions about your | ||
own code. | ||
Replace this comment with a clear outline of what the bug is. | ||
--> | ||
|
||
<!-- | ||
Describe how to replicate the bug. | ||
Include a minimal reproducible example that demonstrates the bug. | ||
Include the full traceback if there was an exception. | ||
--> | ||
|
||
<!-- | ||
Describe the expected behavior that should have happened but didn't. | ||
--> | ||
|
||
Environment: | ||
|
||
- Python version: | ||
- Flask version: | ||
- Flask-Admin version: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
blank_issues_enabled: false | ||
contact_links: | ||
- name: Questions on Discussions | ||
url: https://github.com/pallets-eco/flask-admin/discussions/ | ||
about: Ask questions about your own code on the Discussions tab. | ||
- name: Questions on Chat | ||
url: https://discord.gg/pallets | ||
about: Ask questions about your own code on our Discord chat. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- | ||
name: Feature request | ||
about: Suggest a new feature for Flask-Admin | ||
--- | ||
|
||
<!-- | ||
Replace this comment with a description of what the feature should do. | ||
Include details such as links to relevant specs or previous discussions. | ||
--> | ||
|
||
<!-- | ||
Replace this comment with an example of the problem which this feature | ||
would resolve. Is this problem solvable without changes to Flask-Admin, | ||
such as by subclassing or using an extension? | ||
--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
version: 2 | ||
updates: | ||
- package-ecosystem: github-actions | ||
directory: / | ||
schedule: | ||
interval: monthly | ||
groups: | ||
github-actions: | ||
patterns: | ||
- '*' | ||
- package-ecosystem: pip | ||
directory: /requirements/ | ||
schedule: | ||
interval: monthly | ||
groups: | ||
python-requirements: | ||
patterns: | ||
- '*' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<!-- | ||
Before opening a PR, open a ticket describing the issue or feature the | ||
PR will address. An issue is not required for fixing typos in | ||
documentation, or other simple non-code changes. | ||
Replace this comment with a description of the change. Describe how it | ||
addresses the linked ticket. | ||
--> | ||
|
||
<!-- | ||
Link to relevant issues or previous PRs, one per line. Use "fixes" to | ||
automatically close an issue. | ||
fixes #<issue number> | ||
--> | ||
|
||
<!-- | ||
Ensure each step in the contributing guide is complete, especially the following: | ||
- Add tests that demonstrate the correct behavior of the change. Tests | ||
should fail without the change. | ||
- Add or update relevant docs, in the docs folder and in code. | ||
- Add an entry in CHANGES.rst summarizing the change and linking to the issue. | ||
- Add `.. versionchanged::` entries in any relevant code docs. | ||
--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
name: Lock inactive closed issues | ||
# Lock closed issues that have not received any further activity for two weeks. | ||
# This does not close open issues, only humans may do that. It is easier to | ||
# respond to new issues with fresh examples rather than continuing discussions | ||
# on old issues. | ||
|
||
on: | ||
schedule: | ||
- cron: '0 0 * * *' | ||
permissions: | ||
issues: write | ||
pull-requests: write | ||
concurrency: | ||
group: lock | ||
jobs: | ||
lock: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1 | ||
with: | ||
issue-inactive-days: 14 | ||
pr-inactive-days: 14 | ||
discussion-inactive-days: 14 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
name: Publish | ||
on: | ||
push: | ||
tags: | ||
- '*' | ||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
outputs: | ||
hash: ${{ steps.hash.outputs.hash }} | ||
steps: | ||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 | ||
- uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 | ||
with: | ||
python-version: '3.x' | ||
cache: pip | ||
cache-dependency-path: requirements*/*.txt | ||
- run: pip install -r requirements/build.txt | ||
# Use the commit date instead of the current date during the build. | ||
- run: echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV | ||
- run: python -m build | ||
# Generate hashes used for provenance. | ||
- name: generate hash | ||
id: hash | ||
run: cd dist && echo "hash=$(sha256sum * | base64 -w0)" >> $GITHUB_OUTPUT | ||
- uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 | ||
with: | ||
path: ./dist | ||
provenance: | ||
needs: [build] | ||
permissions: | ||
actions: read | ||
id-token: write | ||
contents: write | ||
# Can't pin with hash due to how this workflow works. | ||
uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected] | ||
with: | ||
base64-subjects: ${{ needs.build.outputs.hash }} | ||
create-release: | ||
# Upload the sdist, wheels, and provenance to a GitHub release. They remain | ||
# available as build artifacts for a while as well. | ||
needs: [provenance] | ||
runs-on: ubuntu-latest | ||
permissions: | ||
contents: write | ||
steps: | ||
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 | ||
- name: create release | ||
run: > | ||
gh release create --draft --repo ${{ github.repository }} | ||
${{ github.ref_name }} | ||
*.intoto.jsonl/* artifact/* | ||
env: | ||
GH_TOKEN: ${{ github.token }} | ||
publish-pypi: | ||
needs: [provenance] | ||
# Wait for approval before attempting to upload to PyPI. This allows reviewing the | ||
# files in the draft release. | ||
environment: | ||
name: publish | ||
url: https://pypi.org/project/Flask-Admin/${{ github.ref_name }} | ||
runs-on: ubuntu-latest | ||
permissions: | ||
id-token: write | ||
steps: | ||
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 | ||
- uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0 | ||
with: | ||
repository-url: https://test.pypi.org/legacy/ | ||
packages-dir: artifact/ | ||
- uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0 | ||
with: | ||
packages-dir: artifact/ |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
name: Tests | ||
on: | ||
push: | ||
branches: | ||
- master | ||
- '*.x' | ||
paths-ignore: | ||
- 'docs/**' | ||
- '*.md' | ||
- '*.rst' | ||
pull_request: | ||
paths-ignore: | ||
- 'docs/**' | ||
- '*.md' | ||
- '*.rst' | ||
jobs: | ||
tests: | ||
name: ${{ matrix.tox == 'normal' && format('py{0}-flask{1}-wtforms{2}', matrix.python, matrix.flask, matrix.wtforms) || matrix.tox }} | ||
runs-on: ${{ matrix.os || 'ubuntu-latest' }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
python: ['3.8', '3.9', '3.10', '3.11', '3.12'] | ||
flask: ['2'] | ||
wtforms: ['2'] | ||
tox: ['normal'] | ||
include: | ||
- python: '3.12' | ||
flask: '2' | ||
wtforms: '2' | ||
tox: 'py312-flask2-wtforms2-no-flask-babel' | ||
services: | ||
# Label used to access the service container | ||
postgres: | ||
# Docker Hub image | ||
image: postgis/postgis:12-master # postgres with postgis installed | ||
# Provide the password for postgres | ||
env: | ||
POSTGRES_PASSWORD: postgres | ||
POSTGRES_DB: flask_admin_test | ||
ports: | ||
- 5432:5432 | ||
# Set health checks to wait until postgres has started | ||
options: >- | ||
--health-cmd pg_isready | ||
--health-interval 10s | ||
--health-timeout 5s | ||
--health-retries 5 | ||
mongo: | ||
image: mongo:5.0.14-focal | ||
ports: | ||
- 27017:27017 | ||
azurite: | ||
image: arafato/azurite:2.6.5 | ||
env: | ||
executable: blob | ||
ports: | ||
- 10000:10000 | ||
steps: | ||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 | ||
- uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 | ||
with: | ||
python-version: ${{ matrix.python }} | ||
allow-prereleases: true | ||
cache: pip | ||
cache-dependency-path: requirements*/*.txt | ||
- name: Install Ubuntu packages | ||
run: | | ||
sudo apt-get update | ||
sudo apt-get install -y libgeos-c1v5 | ||
- name: Check out repository code | ||
uses: actions/checkout@v4 | ||
- name: Set up PostgreSQL hstore module | ||
env: | ||
PGPASSWORD: postgres | ||
run: psql -U postgres -h localhost -c 'CREATE EXTENSION hstore;' flask_admin_test | ||
- run: pip install tox | ||
- run: tox run -e ${{ matrix.tox == 'normal' && format('py{0}-flask{1}-wtforms{2}', matrix.python, matrix.flask, matrix.wtforms) || matrix.tox }} | ||
not_tests: | ||
name: ${{ matrix.tox }} | ||
runs-on: ubuntu-latest | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
tox: ['docs', 'typing'] | ||
steps: | ||
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 | ||
- uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 | ||
with: | ||
python-version: 3.11 | ||
cache: pip | ||
cache-dependency-path: requirements*/*.txt | ||
- name: cache mypy | ||
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 | ||
with: | ||
path: ./.mypy_cache | ||
key: mypy|${{ hashFiles('pyproject.toml') }} | ||
- run: pip install tox | ||
- run: tox run -e ${{ matrix.tox }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
ci: | ||
autoupdate_schedule: monthly | ||
repos: | ||
- repo: https://github.com/astral-sh/ruff-pre-commit | ||
rev: v0.4.7 | ||
hooks: | ||
- id: ruff | ||
- id: ruff-format | ||
- repo: https://github.com/pre-commit/pre-commit-hooks | ||
rev: v4.6.0 | ||
hooks: | ||
- id: check-merge-conflict | ||
- id: debug-statements | ||
- id: fix-byte-order-marker | ||
- id: trailing-whitespace | ||
- id: end-of-file-fixer |
Oops, something went wrong.