Skip to content
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
922aa44
ci(framework): Migrate pyproject.toml to use [project]
danieljanes Feb 28, 2026
f68d3c8
Fix formatting
danieljanes Mar 1, 2026
6157afd
Make E2E pyproject less ambiguous
danieljanes Mar 1, 2026
9a02d2b
Add license classifier
danieljanes Mar 1, 2026
0e83d22
Add simulation extra when installing flwr from artifact store
danieljanes Mar 1, 2026
0ffabc4
Remove --with dev
danieljanes Mar 1, 2026
2640290
ci(*:skip): Improve CI pipelines
danieljanes Mar 1, 2026
9dac122
Merge branch 'main' into improve-ci-pipelines
danieljanes Mar 1, 2026
91ff810
Update docs
danieljanes Mar 1, 2026
eb2734a
Revert changes in intelligence-docs.yml
danieljanes Mar 1, 2026
2f738bb
ci(framework): Migrate pyproject.toml to use [project]
danieljanes Feb 28, 2026
e013b9a
Make E2E pyproject less ambiguous
danieljanes Mar 1, 2026
8815e69
Add license classifier
danieljanes Mar 1, 2026
0130843
Remove --with dev
danieljanes Mar 1, 2026
7d4256b
Merge remote-tracking branch 'refs/remotes/origin/migrate-pyproject' …
danieljanes Mar 1, 2026
ff24e2d
ci(framework): Migrate pyproject.toml to use [project]
danieljanes Feb 28, 2026
8d067fe
Add license classifier
danieljanes Mar 1, 2026
e24eb82
Remove --with dev
danieljanes Mar 1, 2026
7a6667b
Merge remote-tracking branch 'refs/remotes/origin/migrate-pyproject' …
danieljanes Mar 1, 2026
a217f2d
Merge branch 'main' into migrate-pyproject
danieljanes Mar 2, 2026
1cbe331
Move pyproject_meta into devtool
danieljanes Mar 2, 2026
7e02a17
Merge branch 'main' into migrate-pyproject
danieljanes Mar 3, 2026
5e86859
Delete project_meta Python helper
danieljanes Mar 3, 2026
885c892
Merge branch 'main' into migrate-pyproject
danieljanes Mar 3, 2026
e78a434
ci(framework): Add uv support
danieljanes Mar 3, 2026
889913e
Merge branch 'main' into migrate-add-uv
danieljanes Mar 3, 2026
79f5bfe
Add instructions
danieljanes Mar 3, 2026
c1e9d35
Fix test
danieljanes Mar 3, 2026
eb11b59
Merge branch 'main' into migrate-add-uv
danieljanes Mar 4, 2026
6220b13
Update framework/uv.md
danieljanes Mar 4, 2026
b329a05
Merge branch 'main' into migrate-add-uv
danieljanes Mar 4, 2026
acf99f0
Merge branch 'main' into migrate-add-uv
danieljanes Mar 4, 2026
63241f4
Merge branch 'main' into migrate-add-uv
danieljanes Mar 4, 2026
6966b4f
Merge branch 'main' into migrate-add-uv
danieljanes Mar 5, 2026
0dfc082
Merge branch 'main' into migrate-add-uv
danieljanes Mar 5, 2026
938caa3
Update build-uv.sh
danieljanes Mar 5, 2026
ceb4c86
Update bootstrap-uv.sh
danieljanes Mar 5, 2026
a5159c1
Update uv.md
danieljanes Mar 5, 2026
50ac22f
Merge branch 'main' into migrate-add-uv
danieljanes Mar 5, 2026
d6d519f
Update framework/dev/build-uv.sh
danieljanes Mar 5, 2026
eb0da87
Update uv.lock
danieljanes Mar 5, 2026
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
17 changes: 17 additions & 0 deletions dev/bootstrap-uv.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash
set -e
cd "$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"/../

# Setup environment variables for development
./devtool/setup-envs.sh

# Remove caches
./dev/rm-caches.sh

if ! command -v uv >/dev/null 2>&1; then
echo "uv is not installed. Install uv first: https://docs.astral.sh/uv/getting-started/installation/"
exit 1
fi

# Use `uv` to install project dependencies from lockfile
uv sync --python="${version}" --locked --all-extras --all-groups
21 changes: 21 additions & 0 deletions framework/dev/build-uv.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash

# Copyright 2022 Flower Labs GmbH. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ==============================================================================

set -e
cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../

uv build --clear
3 changes: 2 additions & 1 deletion framework/dev/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ python -m pylint --ignore=py/flwr/proto py/flwr
echo "- pylint: done"

echo "- pytest: start"
python -m pytest --cov=py/flwr
# Ray's uv runtime-env hook can stall under `uv run` during pytest.
RAY_ENABLE_UV_RUN_RUNTIME_ENV=0 python -m pytest --cov=py/flwr
echo "- pytest: done"

echo "- All Python checks passed"
Expand Down
9 changes: 9 additions & 0 deletions framework/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,12 @@ dev = [
"devtool",
]

[tool.uv]
default-groups = ["dev"]

[tool.uv.sources]
devtool = { path = "./devtool", editable = true }

[tool.poetry]
packages = [{ include = "flwr", from = "py" }]
exclude = ["py/**/*_test.py"]
Expand Down Expand Up @@ -172,6 +178,9 @@ target-version = ["py310", "py311", "py312", "py313"]
[tool.pylint."MESSAGES CONTROL"]
disable = "duplicate-code,too-few-public-methods,useless-import-alias"

[tool.coverage.run]
data_file = ".pytest_cache/.coverage"

[tool.pytest.ini_options]
minversion = "6.2"
addopts = "-qq"
Expand Down
Loading