-
Notifications
You must be signed in to change notification settings - Fork 1.2k
ci(datasets): Migrate Flower Datasets to uv #6517
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
f02352d
ci(datasets): Migrate Flower Datasets to uv
danieljanes 2067715
Split build and publish into two scripts
danieljanes dd96a4f
Improve rm-caches.sh
danieljanes 98a451c
Make Flower Datasets compatible with the latest version of HF Datasets
danieljanes 04fa80c
Merge branch 'main' into uv-migration-datasets
danieljanes 341ad19
Merge remote-tracking branch 'refs/remotes/origin/uv-migration-datase…
danieljanes 902ba7a
Exclude .venv from taplo fmt
danieljanes a5ee3bb
Merge branch 'main' into uv-migration-datasets
danieljanes d2a7113
Fix docs build
danieljanes e019eaf
Merge branch 'main' into uv-migration-datasets
danieljanes 2387641
Merge branch 'main' into uv-migration-datasets
danieljanes 0562c33
Merge branch 'main' into uv-migration-datasets
danieljanes 440df66
Merge branch 'main' into uv-migration-datasets
danieljanes 269f701
Update uv
danieljanes 8adc585
ci(datasets): Migrate datasets E2E to uv
danieljanes f01494e
Restore deleted tests
danieljanes e8a5d8e
ci(datasets): Migrate Flower Datasets to uv
danieljanes 689ce38
Split build and publish into two scripts
danieljanes 5805884
Make Flower Datasets compatible with the latest version of HF Datasets
danieljanes 753ef96
Exclude .venv from taplo fmt
danieljanes cb278f0
Fix docs build
danieljanes 32f54ce
Update uv
danieljanes 00ed667
Merge remote-tracking branch 'refs/remotes/origin/uv-migration-datase…
danieljanes d60283b
Undo
danieljanes 898d6e6
ci(datasets): Migrate Flower Datasets to uv
danieljanes aaf2dd1
Make Flower Datasets compatible with the latest version of HF Datasets
danieljanes 8621f4f
Revert
danieljanes 6e73989
Remove new docs page
danieljanes 76da4cc
Reorder pyproject.toml
danieljanes 5747591
Reorder pyproject.toml
danieljanes 2e1dc65
Add comment
danieljanes f3ed784
Reorder dependencies
danieljanes 5adf2dd
Lower-case keys
danieljanes 7bcad6e
Add docs
danieljanes 9840590
Merge branch 'main' into uv-migration-datasets
danieljanes b187bcb
Merge branch 'main' into uv-migration-datasets
danieljanes b726ba4
Merge branch 'main' into uv-migration-datasets
danieljanes 15bf78c
Lock dependencies
danieljanes 0eb280f
Bump pillow
danieljanes 42745e8
Merge branch 'main' into uv-migration-datasets
danieljanes b0449df
Merge branch 'main' into uv-migration-datasets
danieljanes b4c0928
Apply suggestion from @jafermarq
jafermarq 75073b8
Merge branch 'main' into uv-migration-datasets
danieljanes d21789a
Update datasets/docs/source/contributor-how-to-develop-flwr-datasets.rst
danieljanes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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,21 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Copyright 2024 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 | ||
jafermarq marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or 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
This file contains hidden or 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,82 @@ | ||
| How to develop Flower Datasets | ||
| ============================== | ||
|
|
||
| Flower Datasets uses `uv <https://docs.astral.sh/uv/>`_ for development and CI. | ||
|
|
||
| Setup | ||
| ----- | ||
|
|
||
| Install dependencies (including all extras): | ||
|
|
||
| .. code-block:: bash | ||
|
|
||
| cd datasets | ||
| uv sync --all-extras | ||
|
|
||
| .. tip:: | ||
|
|
||
| Use ``uv sync --frozen --all-extras`` to ensure ``uv.lock`` is not modified. | ||
|
|
||
| Run checks | ||
| ---------- | ||
|
|
||
| Run formatting and unit tests: | ||
|
|
||
| .. code-block:: bash | ||
|
|
||
| cd datasets | ||
| uv run ./dev/test.sh | ||
|
|
||
| Format | ||
| ------ | ||
|
|
||
| .. code-block:: bash | ||
|
|
||
| cd datasets | ||
| uv run ./dev/format.sh | ||
|
|
||
| Build docs | ||
| ---------- | ||
|
|
||
| .. code-block:: bash | ||
|
|
||
| cd datasets | ||
| uv run ./dev/build-flwr-datasets-docs.sh | ||
|
|
||
| Run E2E tests | ||
| ------------- | ||
|
|
||
| Each E2E directory is a standalone `uv` project. | ||
|
|
||
| .. code-block:: bash | ||
|
|
||
| cd datasets/e2e/pytorch | ||
| uv sync --frozen | ||
| uv run python -m unittest discover -p '*_test.py' | ||
|
|
||
| Repeat for ``datasets/e2e/scikit-learn`` and ``datasets/e2e/tensorflow``. | ||
|
|
||
| Dependency management | ||
| --------------------- | ||
|
|
||
| Avoid using ``uv pip``. | ||
|
|
||
| .. code-block:: bash | ||
|
|
||
| cd datasets | ||
|
|
||
| # Add a runtime dependency | ||
| uv add <package> | ||
|
|
||
| # Add a dev dependency | ||
| uv add --dev <package> | ||
|
|
||
| # Add a dependency to an extra (e.g. "vision") | ||
| uv add --optional vision <package> | ||
|
|
||
| After changing dependencies, update the lockfile and commit it: | ||
|
|
||
| .. code-block:: bash | ||
|
|
||
| cd datasets | ||
| uv lock |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -1,17 +1,14 @@ | ||
| [build-system] | ||
| requires = ["poetry-core>=2.1.3"] | ||
| build-backend = "poetry.core.masonry.api" | ||
|
|
||
| [tool.poetry] | ||
| [project] | ||
| name = "fds-e2e-pytorch" | ||
| version = "0.1.0" | ||
| description = "Flower Datasets with PyTorch" | ||
| authors = ["The Flower Authors <hello@flower.ai>"] | ||
| package-mode = false | ||
| requires-python = ">=3.10" | ||
| dependencies = [ | ||
| "flwr-datasets[vision]", | ||
| "torch>=1.12.0,<3.0.0", | ||
| "torchvision>=0.19.0,<1.0.0", | ||
| "parameterized==0.9.0", | ||
| ] | ||
|
|
||
| [tool.poetry.dependencies] | ||
| python = "^3.10" | ||
| flwr-datasets = { path = "./../../", extras = ["vision"] } | ||
| torch = ">=1.12.0,<3.0.0" | ||
| torchvision = ">=0.19.0,<1.0.0" | ||
| parameterized = "==0.9.0" | ||
| [tool.uv.sources] | ||
| flwr-datasets = { path = "../..", editable = true } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.