Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- dev
paths:
- 'LICENSE'
- 'CHANGELOG.md'
Expand Down Expand Up @@ -52,7 +53,7 @@ jobs:
- name: Install dependencies
run: |
uv pip install -e .
uv pip install --group docs
uv pip install --group docs --group lint

- name: Deploy to GitHub Pages
run: uv run mkdocs gh-deploy --force
142 changes: 132 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,135 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

/.venv
/build
/src/flet_data_table_2.egg-info
/examples/datatable2_example/build/
/examples/datatable2_example/src/__pycache__
/examples/datatable2_example/src/flet_datatable2_example.egg-info
/examples/flet_data_table_example/build
# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock
uv.lock

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site
/src/flet_datatable2.egg-info

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# VS Code
.vscode/

# PDM
.pdm.toml
__pypackages__/

.DS_Store
uv.lock
__pycache__/
20 changes: 20 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.12.5
hooks:
# Run the linter.
- id: ruff
args: [ --fix ]
# Run the formatter.
- id: ruff-format

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace

- repo: https://github.com/aio-libs/sort-all
rev: v1.3.0
hooks:
- id: sort-all
6 changes: 3 additions & 3 deletions examples/datatable2_example/src/example-1.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ def main(page: ft.Page):
fdt.DataTable2(
empty=ft.Text("This table is empty."),
columns=[
fdt.DataColumn2(ft.Text("First name")),
fdt.DataColumn2(ft.Text("Last name")),
fdt.DataColumn2(ft.Text("Age"), numeric=True),
fdt.DataColumn2(label=ft.Text("First name")),
fdt.DataColumn2(label=ft.Text("Last name")),
fdt.DataColumn2(label=ft.Text("Age"), numeric=True),
],
),
)
Expand Down
16 changes: 8 additions & 8 deletions examples/datatable2_example/src/example-2.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,44 +22,44 @@ def all_selected(e: ft.ControlEvent):
def get_data_columns():
data_columns = [
ftd.DataColumn2(
ft.Text("Name"),
label=ft.Text("Name"),
size=ftd.DataColumnSize.L,
on_sort=sort_column,
heading_row_alignment=ft.MainAxisAlignment.START,
),
ftd.DataColumn2(
ft.Text("Calories"),
label=ft.Text("Calories"),
on_sort=sort_column,
numeric=True,
heading_row_alignment=ft.MainAxisAlignment.END,
),
ftd.DataColumn2(
ft.Text("Fat"),
label=ft.Text("Fat"),
on_sort=sort_column,
numeric=True,
),
ftd.DataColumn2(
ft.Text("Carbs"),
label=ft.Text("Carbs"),
on_sort=sort_column,
numeric=True,
),
ftd.DataColumn2(
ft.Text("Protein"),
label=ft.Text("Protein"),
on_sort=sort_column,
numeric=True,
),
ftd.DataColumn2(
ft.Text("Sodium"),
label=ft.Text("Sodium"),
on_sort=sort_column,
numeric=True,
),
ftd.DataColumn2(
ft.Text("Calcium"),
label=ft.Text("Calcium"),
on_sort=sort_column,
numeric=True,
),
ftd.DataColumn2(
ft.Text("Iron"),
label=ft.Text("Iron"),
on_sort=sort_column,
numeric=True,
),
Expand Down
17 changes: 8 additions & 9 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,17 @@ validation:
# Watch
watch:
- docs
- src
- src/flet_datatable2
- CHANGELOG.md
- LICENSE
- README.md

# Plugins
plugins:
# - footnotes
- search:
lang: en
- open-in-new-tab
- mike:
alias_type: symlink
- glightbox
Expand Down Expand Up @@ -131,17 +135,12 @@ plugins:
preload_modules: [ flet ]
filters:
- "!^_" # Exclude private members starting with only one underscore
- "!before_update"
- "!before_event"
- "!clean"
- "!did_mount"
- "!init"
- "!is_isolated"
- "!update"
- "!will_unmount"
- "!get_event_field_type"
extensions:
- griffe_modernized_annotations
- griffe_warnings_deprecated
inventories:
- url: https://docs.flet.dev/objects.inv
- url: https://docs.python.org/3/objects.inv
domains: [ py, std ]
- url: https://typing-extensions.readthedocs.io/en/latest/objects.inv
Expand Down
50 changes: 36 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,43 @@ Issues = "https://github.com/flet-dev/flet-datatable2/issues"
"flutter.flet_datatable2" = ["**/*"]

[dependency-groups]
test = [
"pytest >=7.2.0",
]
lint = [
"ruff >=0.11.7",
]
dev = [
"pre-commit>=4.2.0",
"ruff>=0.11.7",
"pre-commit >=4.2.0",
{ include-group = 'lint' },
{ include-group = 'test' },
]
docs-coverage = [
"docstr-coverage >=2.3.2",
]
docs = [
"mkdocs",
"mkdocs-material",
"mkdocstrings[python]",
"mkdocstrings-python-xref",
"mike",
"markdown>=3.6",
"pymdown-extensions",
"mkdocs-glightbox",
"mkdocs-section-index",
"griffe-modernized-annotations",
"pygments>=2.16",
"mkdocs >=1.6.1",
"mkdocs-material >=9.6.15",
"mkdocstrings-python >=1.16.12",
"mkdocstrings-python-xref >=1.16.3",
"mike >=2.1.3",
"markdown >=3.6",
"pymdown-extensions >=10.16",
"mkdocs-exclude >=1.0.2",
"mkdocs-glightbox >=0.4.0",
"mkdocs-open-in-new-tab >=1.0.8",
"mkdocs-section-index >=0.3.10",
"griffe-modernized-annotations >=1.0.8",
"griffe-warnings-deprecated >=1.1.0",
"pygments >=2.16",
"markdown-exec[ansi] >=1.11.0",
"pydocstyle >=6.3.0",
"linkcheckmd >=1.4.0",
{ include-group = 'docs-coverage' },
]
all = [
{ include-group = 'dev' },
{ include-group = 'docs' },
]

[build-system]
Expand Down Expand Up @@ -64,8 +85,9 @@ select = [
"I"
]
preview = true
pydocstyle = { convention = 'google' }

[tool.ruff.format]
quote-style = "double"
indent-style = "space"
line-ending = "auto"
line-ending = "auto"
7 changes: 7 additions & 0 deletions src/flet_datatable2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@
from .datarow2 import DataRow2
from .datatable2 import DataTable2
from .types import DataColumnSize

__all__ = [
"DataColumn2",
"DataColumnSize",
"DataRow2",
"DataTable2",
]
Loading