From cbd75f28ae7f0c944352e4fa7bf0b129e38f94cf Mon Sep 17 00:00:00 2001 From: Heng Pan Date: Fri, 31 Jan 2025 19:46:27 +0800 Subject: [PATCH] refactor(framework:skip) Bump Flower development version to 1.16 (#4892) --- baselines/docs/source/conf.py | 2 +- dev/update_version.py | 6 +++--- examples/advanced-pytorch/pyproject.toml | 2 +- examples/advanced-tensorflow/pyproject.toml | 2 +- examples/app-pytorch/pyproject.toml | 2 +- examples/custom-metrics/pyproject.toml | 2 +- examples/docs/source/conf.py | 2 +- .../federated-kaplan-meier-fitter/pyproject.toml | 2 +- examples/fl-dp-sa/pyproject.toml | 2 +- examples/fl-tabular/pyproject.toml | 2 +- .../flower-secure-aggregation/pyproject.toml | 2 +- examples/opacus/pyproject.toml | 2 +- .../pyproject.toml | 2 +- examples/quickstart-fastai/pyproject.toml | 2 +- examples/quickstart-huggingface/pyproject.toml | 2 +- examples/quickstart-jax/pyproject.toml | 2 +- examples/quickstart-mlx/pyproject.toml | 2 +- examples/quickstart-monai/pyproject.toml | 2 +- examples/quickstart-pandas/pyproject.toml | 2 +- .../quickstart-pytorch-lightning/pyproject.toml | 2 +- examples/quickstart-pytorch/pyproject.toml | 2 +- .../quickstart-sklearn-tabular/pyproject.toml | 2 +- examples/quickstart-tensorflow/pyproject.toml | 2 +- examples/sklearn-logreg-mnist/pyproject.toml | 2 +- examples/tensorflow-privacy/pyproject.toml | 2 +- examples/vertical-fl/pyproject.toml | 2 +- examples/xgboost-comprehensive/pyproject.toml | 2 +- examples/xgboost-quickstart/pyproject.toml | 2 +- framework/docs/source/conf.py | 4 ++-- pyproject.toml | 2 +- src/docker/complete/compose.yml | 16 ++++++++-------- src/docker/distributed/client/compose.yml | 12 ++++++------ src/docker/distributed/server/compose.yml | 4 ++-- .../templates/app/pyproject.baseline.toml.tpl | 2 +- .../templates/app/pyproject.flowertune.toml.tpl | 2 +- .../templates/app/pyproject.huggingface.toml.tpl | 2 +- .../cli/new/templates/app/pyproject.jax.toml.tpl | 2 +- .../cli/new/templates/app/pyproject.mlx.toml.tpl | 2 +- .../new/templates/app/pyproject.numpy.toml.tpl | 2 +- .../new/templates/app/pyproject.pytorch.toml.tpl | 2 +- .../new/templates/app/pyproject.sklearn.toml.tpl | 2 +- .../templates/app/pyproject.tensorflow.toml.tpl | 2 +- 42 files changed, 58 insertions(+), 58 deletions(-) diff --git a/baselines/docs/source/conf.py b/baselines/docs/source/conf.py index ccfe9b2448ca..a66bdb3aa0b6 100644 --- a/baselines/docs/source/conf.py +++ b/baselines/docs/source/conf.py @@ -37,7 +37,7 @@ author = "The Flower Authors" # The full version, including alpha/beta/rc tags -release = "1.15.0" +release = "1.16.0" # -- General configuration --------------------------------------------------- diff --git a/dev/update_version.py b/dev/update_version.py index e80b1b6a68ca..017c030b5863 100644 --- a/dev/update_version.py +++ b/dev/update_version.py @@ -10,9 +10,6 @@ "framework/docs/source/conf.py": [ ".. |stable_flwr_version| replace:: {version}", ], - "src/py/flwr/cli/new/templates/app/pyproject.*.toml.tpl": [ - "flwr[simulation]>={version}", - ], } REPLACE_NEXT_VERSION = { @@ -25,6 +22,9 @@ "src/docker/complete/compose.yml": ["FLWR_VERSION:-{version}"], "src/docker/distributed/client/compose.yml": ["FLWR_VERSION:-{version}"], "src/docker/distributed/server/compose.yml": ["FLWR_VERSION:-{version}"], + "src/py/flwr/cli/new/templates/app/pyproject.*.toml.tpl": [ + "flwr[simulation]>={version}", + ], } EXAMPLES = { diff --git a/examples/advanced-pytorch/pyproject.toml b/examples/advanced-pytorch/pyproject.toml index 059dbd127bde..11352d36b28c 100644 --- a/examples/advanced-pytorch/pyproject.toml +++ b/examples/advanced-pytorch/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with PyTorch and Flower (Advanced Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "torch==2.2.1", "torchvision==0.17.1", diff --git a/examples/advanced-tensorflow/pyproject.toml b/examples/advanced-tensorflow/pyproject.toml index 4f0f904c3436..869e8239093b 100644 --- a/examples/advanced-tensorflow/pyproject.toml +++ b/examples/advanced-tensorflow/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with Tensorflow/Keras and Flower (Advanced Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "tensorflow-cpu>=2.9.1, != 2.11.1 ; platform_machine == \"x86_64\"", "tensorflow-macos>=2.9.1, != 2.11.1 ; sys_platform == \"darwin\" and platform_machine == \"arm64\"", diff --git a/examples/app-pytorch/pyproject.toml b/examples/app-pytorch/pyproject.toml index 927e47430c9d..5a5a9dc4b776 100644 --- a/examples/app-pytorch/pyproject.toml +++ b/examples/app-pytorch/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.5.0", "torch==2.5.1", "torchvision==0.20.1", diff --git a/examples/custom-metrics/pyproject.toml b/examples/custom-metrics/pyproject.toml index bf8316b90a4f..1068ccbc1977 100644 --- a/examples/custom-metrics/pyproject.toml +++ b/examples/custom-metrics/pyproject.toml @@ -12,7 +12,7 @@ version = "1.0.0" description = "Federated Learning with Flower and Custom Metrics" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "scikit-learn>=1.2.2", "tensorflow==2.12.1; sys_platform != 'darwin'", diff --git a/examples/docs/source/conf.py b/examples/docs/source/conf.py index c136851cf682..bc8dea69659c 100644 --- a/examples/docs/source/conf.py +++ b/examples/docs/source/conf.py @@ -29,7 +29,7 @@ author = "The Flower Authors" # The full version, including alpha/beta/rc tags -release = "1.15.0" +release = "1.16.0" # -- General configuration --------------------------------------------------- diff --git a/examples/federated-kaplan-meier-fitter/pyproject.toml b/examples/federated-kaplan-meier-fitter/pyproject.toml index 572e7cd5cd76..6a1344173a1c 100644 --- a/examples/federated-kaplan-meier-fitter/pyproject.toml +++ b/examples/federated-kaplan-meier-fitter/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Kaplan Meier Fitter with Flower" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets>=0.3.0", "numpy>=1.23.2", "pandas>=2.0.0", diff --git a/examples/fl-dp-sa/pyproject.toml b/examples/fl-dp-sa/pyproject.toml index 22f7d75bed7b..b0d52500cb88 100644 --- a/examples/fl-dp-sa/pyproject.toml +++ b/examples/fl-dp-sa/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Central Differential Privacy and Secure Aggregation in Flower" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "torch==2.2.1", "torchvision==0.17.1", diff --git a/examples/fl-tabular/pyproject.toml b/examples/fl-tabular/pyproject.toml index 055e22e3e2a1..f12fe06b5a8d 100644 --- a/examples/fl-tabular/pyproject.toml +++ b/examples/fl-tabular/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Adult Census Income Tabular Dataset and Federated Learning in Flower" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets>=0.3.0", "torch==2.5.1", "scikit-learn==1.5.0", diff --git a/examples/flower-secure-aggregation/pyproject.toml b/examples/flower-secure-aggregation/pyproject.toml index 850055a61e2d..b974c6110c43 100644 --- a/examples/flower-secure-aggregation/pyproject.toml +++ b/examples/flower-secure-aggregation/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Secure Aggregation in Flower" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "torch==2.2.1", "torchvision==0.17.1", diff --git a/examples/opacus/pyproject.toml b/examples/opacus/pyproject.toml index 662a969ee00b..8d49b7c97470 100644 --- a/examples/opacus/pyproject.toml +++ b/examples/opacus/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Sample-level Differential Privacy with Opacus in Flower" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "torch==2.1.1", "torchvision==0.16.1", diff --git a/examples/pytorch-federated-variational-autoencoder/pyproject.toml b/examples/pytorch-federated-variational-autoencoder/pyproject.toml index 5955beea49be..6c50050828a3 100644 --- a/examples/pytorch-federated-variational-autoencoder/pyproject.toml +++ b/examples/pytorch-federated-variational-autoencoder/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Variational Autoencoder Example with PyTorch and Flower" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "torch==2.2.1", "torchvision==0.17.1", diff --git a/examples/quickstart-fastai/pyproject.toml b/examples/quickstart-fastai/pyproject.toml index 3ee4625ee536..49b903b7590c 100644 --- a/examples/quickstart-fastai/pyproject.toml +++ b/examples/quickstart-fastai/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with Fastai and Flower (Quickstart Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "fastai==2.7.14", "torch==2.2.0", diff --git a/examples/quickstart-huggingface/pyproject.toml b/examples/quickstart-huggingface/pyproject.toml index febd41d681a6..55b54d894f63 100644 --- a/examples/quickstart-huggingface/pyproject.toml +++ b/examples/quickstart-huggingface/pyproject.toml @@ -12,7 +12,7 @@ authors = [ { name = "Kaushik Amar Das", email = "kaushik.das@iiitg.ac.in" }, ] dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets>=0.3.0", "torch==2.4.0", "transformers>=4.30.0,<5.0", diff --git a/examples/quickstart-jax/pyproject.toml b/examples/quickstart-jax/pyproject.toml index fdb570390b4b..202318078c16 100644 --- a/examples/quickstart-jax/pyproject.toml +++ b/examples/quickstart-jax/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.4.0", "datasets>=2.21.0", "jax==0.4.31", diff --git a/examples/quickstart-mlx/pyproject.toml b/examples/quickstart-mlx/pyproject.toml index af5df1684ce7..1fbae7a93238 100644 --- a/examples/quickstart-mlx/pyproject.toml +++ b/examples/quickstart-mlx/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with MLX and Flower (Quickstart Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "mlx==0.21.1", ] diff --git a/examples/quickstart-monai/pyproject.toml b/examples/quickstart-monai/pyproject.toml index 333946272ef0..c5d0410234b9 100644 --- a/examples/quickstart-monai/pyproject.toml +++ b/examples/quickstart-monai/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with MONAI and Flower (Quickstart Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "monai==1.3.2", "filelock==3.15.4", diff --git a/examples/quickstart-pandas/pyproject.toml b/examples/quickstart-pandas/pyproject.toml index 819916f92e57..39e3d7bae540 100644 --- a/examples/quickstart-pandas/pyproject.toml +++ b/examples/quickstart-pandas/pyproject.toml @@ -12,7 +12,7 @@ authors = [ { name = "Ragy Haddad", email = "ragy202@gmail.com" }, ] dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "numpy>=1.26.0", "pandas==2.0.0", diff --git a/examples/quickstart-pytorch-lightning/pyproject.toml b/examples/quickstart-pytorch-lightning/pyproject.toml index a9ca13a5cee6..d9e271da6277 100644 --- a/examples/quickstart-pytorch-lightning/pyproject.toml +++ b/examples/quickstart-pytorch-lightning/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with PyTorch Lightning and Flower (Quickstart Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "pytorch-lightning<2.0.0; sys_platform == 'darwin'", "pytorch-lightning==1.6.0; sys_platform != 'darwin'", diff --git a/examples/quickstart-pytorch/pyproject.toml b/examples/quickstart-pytorch/pyproject.toml index a4a1cd452e0d..d0f2e0df22f8 100644 --- a/examples/quickstart-pytorch/pyproject.toml +++ b/examples/quickstart-pytorch/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with PyTorch and Flower (Quickstart Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "torch==2.2.1", "torchvision==0.17.1", diff --git a/examples/quickstart-sklearn-tabular/pyproject.toml b/examples/quickstart-sklearn-tabular/pyproject.toml index 44226f75075a..de4c552d6c63 100644 --- a/examples/quickstart-sklearn-tabular/pyproject.toml +++ b/examples/quickstart-sklearn-tabular/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with scikit-learn and Flower (Quickstart Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "scikit-learn>=1.3.0", ] diff --git a/examples/quickstart-tensorflow/pyproject.toml b/examples/quickstart-tensorflow/pyproject.toml index 1c60db002ce0..12d06ccd8257 100644 --- a/examples/quickstart-tensorflow/pyproject.toml +++ b/examples/quickstart-tensorflow/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with Tensorflow/Keras and Flower (Quickstart Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "tensorflow>=2.9.1, != 2.11.1 ; (platform_machine == \"x86_64\" or platform_machine == \"aarch64\")", "tensorflow-macos>=2.9.1, != 2.11.1 ; sys_platform == \"darwin\" and platform_machine == \"arm64\"", diff --git a/examples/sklearn-logreg-mnist/pyproject.toml b/examples/sklearn-logreg-mnist/pyproject.toml index 502cc609c09a..3ef2cccecf0b 100644 --- a/examples/sklearn-logreg-mnist/pyproject.toml +++ b/examples/sklearn-logreg-mnist/pyproject.toml @@ -12,7 +12,7 @@ authors = [ { name = "Kaushik Amar Das", email = "kaushik.das@iiitg.ac.in" }, ] dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "numpy>=2.0.0", "scikit-learn~=1.2.2", diff --git a/examples/tensorflow-privacy/pyproject.toml b/examples/tensorflow-privacy/pyproject.toml index a3df8ad118e3..b094b5abf58a 100644 --- a/examples/tensorflow-privacy/pyproject.toml +++ b/examples/tensorflow-privacy/pyproject.toml @@ -7,7 +7,7 @@ name = "tensorflow-privacy-fl" version = "1.0.0" description = "Sample-level Differential Privacy with Tensorflow-Privacy in Flower" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets[vision]>=0.3.0", "tensorflow-estimator~=2.4", "tensorflow-probability~=0.22.0", diff --git a/examples/vertical-fl/pyproject.toml b/examples/vertical-fl/pyproject.toml index 72eca54ee566..69ba9a0969e2 100644 --- a/examples/vertical-fl/pyproject.toml +++ b/examples/vertical-fl/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "PyTorch Vertical FL with Flower" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets>=0.3.0", "pandas==2.2.3", "numpy>=1.26.0", diff --git a/examples/xgboost-comprehensive/pyproject.toml b/examples/xgboost-comprehensive/pyproject.toml index 3a4950d6f508..3be323d50451 100644 --- a/examples/xgboost-comprehensive/pyproject.toml +++ b/examples/xgboost-comprehensive/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with XGBoost and Flower (Comprehensive Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets>=0.3.0", "xgboost>=2.0.0", ] diff --git a/examples/xgboost-quickstart/pyproject.toml b/examples/xgboost-quickstart/pyproject.toml index 7dbafbc19d12..281735b1a46e 100644 --- a/examples/xgboost-quickstart/pyproject.toml +++ b/examples/xgboost-quickstart/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.0" description = "Federated Learning with XGBoost and Flower (Quickstart Example)" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.14.0", + "flwr[simulation]>=1.15.0", "flwr-datasets>=0.4.0", "xgboost>=2.0.0", ] diff --git a/framework/docs/source/conf.py b/framework/docs/source/conf.py index a8db33d28346..5f1e138ab5bb 100644 --- a/framework/docs/source/conf.py +++ b/framework/docs/source/conf.py @@ -89,10 +89,10 @@ author = "The Flower Authors" # The full version of the next release, including alpha/beta/rc tags -release = "1.15.0" +release = "1.16.0" # The current released version rst_prolog = """ -.. |stable_flwr_version| replace:: 1.14.0 +.. |stable_flwr_version| replace:: 1.15.0 .. |stable_flwr_superlink_docker_digest| replace:: 4b317d5b6030710b476f4dbfab2c3a33021ad40a0fcfa54d7edd45e0c51d889c .. |ubuntu_version| replace:: 24.04 .. |setuptools_version| replace:: 70.3.0 diff --git a/pyproject.toml b/pyproject.toml index fb306547395e..a176341ebe25 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "flwr" -version = "1.15.0" +version = "1.16.0" description = "Flower: A Friendly Federated AI Framework" license = "Apache-2.0" authors = ["The Flower Authors "] diff --git a/src/docker/complete/compose.yml b/src/docker/complete/compose.yml index 2e27895a2e2c..57b45ddd7761 100644 --- a/src/docker/complete/compose.yml +++ b/src/docker/complete/compose.yml @@ -1,7 +1,7 @@ services: # create a SuperLink service superlink: - image: flwr/superlink:${FLWR_VERSION:-1.15.0} + image: flwr/superlink:${FLWR_VERSION:-1.16.0} command: - --insecure - --isolation @@ -14,7 +14,7 @@ services: build: context: ${PROJECT_DIR:-.} dockerfile_inline: | - FROM flwr/serverapp:${FLWR_VERSION:-1.15.0} + FROM flwr/serverapp:${FLWR_VERSION:-1.16.0} # gcc is required for the fastai quickstart example USER root @@ -40,7 +40,7 @@ services: # create two SuperNode services with different node configs supernode-1: - image: flwr/supernode:${FLWR_VERSION:-1.15.0} + image: flwr/supernode:${FLWR_VERSION:-1.16.0} command: - --insecure - --superlink @@ -55,7 +55,7 @@ services: - superlink supernode-2: - image: flwr/supernode:${FLWR_VERSION:-1.15.0} + image: flwr/supernode:${FLWR_VERSION:-1.16.0} command: - --insecure - --superlink @@ -72,7 +72,7 @@ services: # uncomment to add another SuperNode # # supernode-3: - # image: flwr/supernode:${FLWR_VERSION:-1.15.0} + # image: flwr/supernode:${FLWR_VERSION:-1.16.0} # command: # - --insecure # - --superlink @@ -91,7 +91,7 @@ services: build: context: ${PROJECT_DIR:-.} dockerfile_inline: | - FROM flwr/clientapp:${FLWR_VERSION:-1.15.0} + FROM flwr/clientapp:${FLWR_VERSION:-1.16.0} # gcc is required for the fastai quickstart example USER root @@ -123,7 +123,7 @@ services: build: context: ${PROJECT_DIR:-.} dockerfile_inline: | - FROM flwr/clientapp:${FLWR_VERSION:-1.15.0} + FROM flwr/clientapp:${FLWR_VERSION:-1.16.0} # gcc is required for the fastai quickstart example USER root @@ -156,7 +156,7 @@ services: # build: # context: ${PROJECT_DIR:-.} # dockerfile_inline: | - # FROM flwr/clientapp:${FLWR_VERSION:-1.15.0} + # FROM flwr/clientapp:${FLWR_VERSION:-1.16.0} # # gcc is required for the fastai quickstart example # USER root diff --git a/src/docker/distributed/client/compose.yml b/src/docker/distributed/client/compose.yml index 803374cc6d80..9a20f02fd3d1 100644 --- a/src/docker/distributed/client/compose.yml +++ b/src/docker/distributed/client/compose.yml @@ -1,6 +1,6 @@ services: supernode-1: - image: flwr/supernode:${FLWR_VERSION:-1.15.0} + image: flwr/supernode:${FLWR_VERSION:-1.16.0} command: - --superlink - ${SUPERLINK_IP:-127.0.0.1}:9092 @@ -17,7 +17,7 @@ services: target: /app/certificates/superlink-ca.crt supernode-2: - image: flwr/supernode:${FLWR_VERSION:-1.15.0} + image: flwr/supernode:${FLWR_VERSION:-1.16.0} command: - --superlink - ${SUPERLINK_IP:-127.0.0.1}:9092 @@ -36,7 +36,7 @@ services: # uncomment to add another SuperNode # # supernode-3: - # image: flwr/supernode:${FLWR_VERSION:-1.15.0} + # image: flwr/supernode:${FLWR_VERSION:-1.16.0} # command: # - --superlink # - ${SUPERLINK_IP:-127.0.0.1}:9092 @@ -56,7 +56,7 @@ services: build: context: ${PROJECT_DIR:-.} dockerfile_inline: | - FROM flwr/clientapp:${FLWR_VERSION:-1.15.0} + FROM flwr/clientapp:${FLWR_VERSION:-1.16.0} WORKDIR /app COPY --chown=app:app pyproject.toml . @@ -80,7 +80,7 @@ services: build: context: ${PROJECT_DIR:-.} dockerfile_inline: | - FROM flwr/clientapp:${FLWR_VERSION:-1.15.0} + FROM flwr/clientapp:${FLWR_VERSION:-1.16.0} WORKDIR /app COPY --chown=app:app pyproject.toml . @@ -105,7 +105,7 @@ services: # build: # context: ${PROJECT_DIR:-.} # dockerfile_inline: | - # FROM flwr/clientapp:${FLWR_VERSION:-1.15.0} + # FROM flwr/clientapp:${FLWR_VERSION:-1.16.0} # WORKDIR /app # COPY --chown=app:app pyproject.toml . diff --git a/src/docker/distributed/server/compose.yml b/src/docker/distributed/server/compose.yml index 0f80cc97ee2f..89f5de865f28 100644 --- a/src/docker/distributed/server/compose.yml +++ b/src/docker/distributed/server/compose.yml @@ -1,6 +1,6 @@ services: superlink: - image: flwr/superlink:${FLWR_VERSION:-1.14.0} + image: flwr/superlink:${FLWR_VERSION:-1.16.0} command: - --isolation - process @@ -25,7 +25,7 @@ services: build: context: ${PROJECT_DIR:-.} dockerfile_inline: | - FROM flwr/serverapp:${FLWR_VERSION:-1.14.0} + FROM flwr/serverapp:${FLWR_VERSION:-1.16.0} WORKDIR /app COPY --chown=app:app pyproject.toml . diff --git a/src/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl index 7ec6797621ae..76421510104d 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "flwr-datasets[vision]>=0.5.0", "torch==2.5.1", "torchvision==0.20.1", diff --git a/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl index b682284dfa47..2c0ce9c747b7 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "flwr-datasets>=0.5.0", "torch==2.3.1", "trl==0.8.1", diff --git a/src/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl index 3886b094a601..bf038e0ebb03 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "flwr-datasets>=0.5.0", "torch==2.5.1", "transformers>=4.30.0,<5.0", diff --git a/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl index e8a939a43d29..09157d51522f 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "jax==0.4.30", "jaxlib==0.4.30", "scikit-learn==1.6.1", diff --git a/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl index 8a06c01c0797..5f8b1ba3e660 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "flwr-datasets[vision]>=0.5.0", "mlx==0.21.1", ] diff --git a/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl index c80bbdc3fc5d..56c45bb1a01d 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "numpy>=2.0.2", ] diff --git a/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl index 287c6e00c9eb..1f20b7a4ec2a 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "flwr-datasets[vision]>=0.5.0", "torch==2.5.1", "torchvision==0.20.1", diff --git a/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl index beb237335ac3..dfd02f724a16 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "flwr-datasets[vision]>=0.5.0", "scikit-learn>=1.6.1", ] diff --git a/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl b/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl index 913301e86006..5aede6438396 100644 --- a/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl +++ b/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl @@ -8,7 +8,7 @@ version = "1.0.0" description = "" license = "Apache-2.0" dependencies = [ - "flwr[simulation]>=1.15.0", + "flwr[simulation]>=1.16.0", "flwr-datasets[vision]>=0.5.0", "tensorflow>=2.11.1,<2.18.0", ]