Skip to content

Commit

Permalink
refactor(framework:skip) Update all versions to 1.15.0 (#4751)
Browse files Browse the repository at this point in the history
  • Loading branch information
chongshenng authored Dec 20, 2024
1 parent 6a24e6b commit 500d04e
Show file tree
Hide file tree
Showing 43 changed files with 57 additions and 58 deletions.
3 changes: 1 addition & 2 deletions baselines/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import os
import sys


# Configuration file for the Sphinx documentation builder.
#
# This file only contains a selection of the most common options. For a full
Expand All @@ -38,7 +37,7 @@
author = "The Flower Authors"

# The full version, including alpha/beta/rc tags
release = "1.14.0"
release = "1.15.0"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced-pytorch/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced-tensorflow/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.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\"",
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-metrics/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version = "1.0.0"
description = "Federated Learning with Flower and Custom Metrics"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"scikit-learn>=1.2.2",
"tensorflow==2.12.0; sys_platform != 'darwin'",
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
author = "The Flower Authors"

# The full version, including alpha/beta/rc tags
release = "1.14.0"
release = "1.15.0"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/embedded-devices/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Federated AI with Embedded Devices using Flower"
license = "Apache-2.0"
dependencies = [
"flwr>=1.13.0",
"flwr>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/federated-kaplan-meier-fitter/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Federated Kaplan Meier Fitter with Flower"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets>=0.3.0",
"numpy>=1.23.2",
"pandas>=2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/fl-dp-sa/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/fl-tabular/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets>=0.3.0",
"torch==2.1.1",
"scikit-learn==1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/flower-authentication/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Federated Learning with PyTorch and authenticated Flower "
license = "Apache-2.0"
dependencies = [
"flwr>=1.13.1",
"flwr>=1.14.0",
"flwr-datasets[vision]>=0.4.0",
"torch>=2.5.0,<3.0.0",
"torchvision>=0.20.1,<0.21.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/flower-secure-aggregation/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Secure Aggregation in Flower"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = ""
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.4.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/opacus/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "Sample-level Differential Privacy with Opacus in Flower"

dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.1.1",
"torchvision==0.16.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-fastai/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"fastai==2.7.14",
"torch==2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-huggingface/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
{ name = "Kaushik Amar Das", email = "[email protected]" },
]
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets>=0.3.0",
"torch==2.4.0",
"transformers>=4.30.0,<5.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-jax/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = ""
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.4.0",
"datasets>=2.21.0",
"jax==0.4.31",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-mlx/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"mlx==0.21.1",
]
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-monai/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"monai==1.3.2",
"filelock==3.15.4",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-pandas/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
{ name = "Ragy Haddad", email = "[email protected]" },
]
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"numpy>=1.26.0",
"pandas==2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-pytorch-lightning/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"pytorch-lightning<2.0.0; sys_platform == 'darwin'",
"pytorch-lightning==1.6.0; sys_platform != 'darwin'",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-pytorch/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"torch==2.2.1",
"torchvision==0.17.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-sklearn-tabular/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"scikit-learn>=1.3.0",
]
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-tensorflow/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.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\"",
Expand Down
2 changes: 1 addition & 1 deletion examples/sklearn-logreg-mnist/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
{ name = "Kaushik Amar Das", email = "[email protected]" },
]
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"numpy>=2.0.0",
"scikit-learn~=1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/tensorflow-privacy/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets[vision]>=0.3.0",
"tensorflow-estimator~=2.4",
"tensorflow-probability~=0.22.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/vertical-fl/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.0.0"
description = "PyTorch Vertical FL with Flower"
license = "Apache-2.0"
dependencies = [
"flwr[simulation]>=1.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets>=0.3.0",
"pandas==2.0.3",
"numpy>=1.26.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/xgboost-comprehensive/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets>=0.3.0",
"xgboost>=2.0.0",
]
Expand Down
2 changes: 1 addition & 1 deletion examples/xgboost-quickstart/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.1",
"flwr[simulation]>=1.14.0",
"flwr-datasets>=0.4.0",
"xgboost>=2.0.0",
]
Expand Down
4 changes: 2 additions & 2 deletions framework/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@
author = "The Flower Authors"

# The full version of the next release, including alpha/beta/rc tags
release = "1.14.0"
release = "1.15.0"
# The current released version
rst_prolog = """
.. |stable_flwr_version| replace:: 1.13.1
.. |stable_flwr_version| replace:: 1.14.0
.. |stable_flwr_superlink_docker_digest| replace:: 4b317d5b6030710b476f4dbfab2c3a33021ad40a0fcfa54d7edd45e0c51d889c
.. |ubuntu_version| replace:: 24.04
.. |setuptools_version| replace:: 70.3.0
Expand Down
2 changes: 2 additions & 0 deletions framework/docs/source/ref-changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog

## Unreleased

## v1.14.0 (2024-12-20)

### Thanks to our contributors
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "flwr"
version = "1.14.0"
version = "1.15.0"
description = "Flower: A Friendly Federated AI Framework"
license = "Apache-2.0"
authors = ["The Flower Authors <[email protected]>"]
Expand Down
17 changes: 8 additions & 9 deletions src/docker/complete/compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
# create a SuperLink service
superlink:
image: flwr/superlink:${FLWR_VERSION:-1.14.0}
image: flwr/superlink:${FLWR_VERSION:-1.15.0}
command:
- --insecure
- --isolation
Expand All @@ -14,7 +14,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/serverapp:${FLWR_VERSION:-1.14.0}
FROM flwr/serverapp:${FLWR_VERSION:-1.15.0}
# gcc is required for the fastai quickstart example
USER root
Expand All @@ -40,7 +40,7 @@ services:

# create a two SuperNode service with different node configs
supernode-1:
image: flwr/supernode:${FLWR_VERSION:-1.14.0}
image: flwr/supernode:${FLWR_VERSION:-1.15.0}
command:
- --insecure
- --superlink
Expand All @@ -55,7 +55,7 @@ services:
- superlink

supernode-2:
image: flwr/supernode:${FLWR_VERSION:-1.14.0}
image: flwr/supernode:${FLWR_VERSION:-1.15.0}
command:
- --insecure
- --superlink
Expand All @@ -72,7 +72,7 @@ services:
# uncomment to add another SuperNode
#
# supernode-3:
# image: flwr/supernode:${FLWR_VERSION:-1.14.0}
# image: flwr/supernode:${FLWR_VERSION:-1.15.0}
# command:
# - --insecure
# - --superlink
Expand All @@ -90,7 +90,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/clientapp:${FLWR_VERSION:-1.14.0}
FROM flwr/clientapp:${FLWR_VERSION:-1.15.0}
# gcc is required for the fastai quickstart example
USER root
Expand Down Expand Up @@ -122,7 +122,7 @@ services:
build:
context: ${PROJECT_DIR:-.}
dockerfile_inline: |
FROM flwr/clientapp:${FLWR_VERSION:-1.14.0}
FROM flwr/clientapp:${FLWR_VERSION:-1.15.0}
# gcc is required for the fastai quickstart example
USER root
Expand All @@ -149,14 +149,13 @@ services:
stop_signal: SIGINT
depends_on:
- supernode-2

# uncomment to add another ClientApp
#
# clientapp-3:
# build:
# context: ${PROJECT_DIR:-.}
# dockerfile_inline: |
# FROM flwr/clientapp:${FLWR_VERSION:-1.14.0}
# FROM flwr/clientapp:${FLWR_VERSION:-1.15.0}

# # gcc is required for the fastai quickstart example
# USER root
Expand Down
Loading

0 comments on commit 500d04e

Please sign in to comment.