Skip to content

Commit

Permalink
remove support for py 3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Wrede committed Nov 18, 2024
1 parent d7a9847 commit 4bf9003
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 35 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
author = "Scaleout Systems AB"

# The full version, including alpha/beta/rc tags
release = "0.19.0"
release = "0.20.0"

# Add any Sphinx extension module names here, as strings
extensions = [
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Getting started with FEDn

**Prerequisites**

- `Python >=3.8, <=3.12 <https://www.python.org/downloads>`__
- `Python >=3.9, <=3.12 <https://www.python.org/downloads>`__
- `A FEDn Studio account <https://fedn.scaleoutsystems.com/signup>`__


Expand Down
2 changes: 1 addition & 1 deletion examples/FedSimSiam/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To run the example, follow the steps below. For a more detailed explanation, fol
Prerequisites
-------------

- `Python >=3.8, <=3.12 <https://www.python.org/downloads>`__
- `Python >=3.9, <=3.12 <https://www.python.org/downloads>`__
- `A project in FEDn Studio <https://fedn.scaleoutsystems.com/signup>`__

Creating the compute package and seed model
Expand Down
5 changes: 2 additions & 3 deletions examples/FedSimSiam/client/python_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- torch==2.2.2; sys_platform == "darwin" and platform_machine == "x86_64"
- torchvision==0.19.1; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- torchvision==0.17.2; sys_platform == "darwin" and platform_machine == "x86_64"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64" and python_version >= "3.9") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux" and python_version >= "3.9")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64" and python_version >= "3.9")
- numpy==1.24.4; python_version == "3.8"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64")
- fedn
5 changes: 2 additions & 3 deletions examples/flower-client/client/python_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ dependencies:
- torch==2.2.2; sys_platform == "darwin" and platform_machine == "x86_64"
- torchvision==0.19.1; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- torchvision==0.17.2; sys_platform == "darwin" and platform_machine == "x86_64"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64" and python_version >= "3.9") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux" and python_version >= "3.9")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64" and python_version >= "3.9")
- numpy==1.24.4; python_version == "3.8"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64")
- fire==0.3.1
- flwr-datasets[vision]==0.1.0
2 changes: 1 addition & 1 deletion examples/huggingface/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To run the example, follow the steps below. For a more detailed explanation, fol
Prerequisites
-------------

- `Python >=3.8, <=3.12 <https://www.python.org/downloads>`__
- `Python >=3.9, <=3.12 <https://www.python.org/downloads>`__
- `A project in FEDn Studio <https://fedn.scaleoutsystems.com/signup>`__

Creating the compute package and seed model
Expand Down
5 changes: 2 additions & 3 deletions examples/huggingface/client/python_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ dependencies:
- torch==2.2.2; sys_platform == "darwin" and platform_machine == "x86_64"
- torchvision==0.19.1; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- torchvision==0.17.2; sys_platform == "darwin" and platform_machine == "x86_64"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64" and python_version >= "3.9") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux" and python_version >= "3.9")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64" and python_version >= "3.9")
- numpy==1.24.4; python_version == "3.8"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64")
- transformers
- datasets
- fedn
2 changes: 1 addition & 1 deletion examples/mnist-keras/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is a TF/Keras version of the PyTorch Quickstart Tutorial. For a step-by-ste
Prerequisites
-------------------------------------------

- `Python >=3.8, <=3.12 <https://www.python.org/downloads>`__
- `Python >=3.9, <=3.12 <https://www.python.org/downloads>`__

Creating the compute package and seed model
-------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/mnist-pytorch-DPSGD/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We have expanded our baseline MNIST-PyTorch example by incorporating the Opacus
Prerequisites
-------------

- `Python >=3.8, <=3.12 <https://www.python.org/downloads>`__
- `Python >=3.9, <=3.12 <https://www.python.org/downloads>`__
- `A project in FEDn Studio <https://fedn.scaleoutsystems.com/signup>`__

Edit Differential Privacy budget
Expand Down
5 changes: 2 additions & 3 deletions examples/mnist-pytorch-DPSGD/client/python_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- torch==2.2.2; sys_platform == "darwin" and platform_machine == "x86_64"
- torchvision==0.19.1; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- torchvision==0.17.2; sys_platform == "darwin" and platform_machine == "x86_64"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64" and python_version >= "3.9") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux" and python_version >= "3.9")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64" and python_version >= "3.9")
- numpy==1.24.4; python_version == "3.8"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64")
- opacus
2 changes: 1 addition & 1 deletion examples/mnist-pytorch/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The example is intented as a minimalistic quickstart to learn how to use FEDn.
Prerequisites
-------------

- `Python >=3.8, <=3.12 <https://www.python.org/downloads>`__
- `Python >=3.9, <=3.12 <https://www.python.org/downloads>`__
- `A project in FEDn Studio <https://fedn.scaleoutsystems.com/signup>`__

Creating the compute package and seed model
Expand Down
5 changes: 2 additions & 3 deletions examples/mnist-pytorch/client/python_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ dependencies:
- torch==2.2.2; sys_platform == "darwin" and platform_machine == "x86_64"
- torchvision==0.19.1; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- torchvision==0.17.2; sys_platform == "darwin" and platform_machine == "x86_64"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64" and python_version >= "3.9") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux" and python_version >= "3.9")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64" and python_version >= "3.9")
- numpy==1.24.4; python_version == "3.8"
- numpy==2.0.2; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- numpy==1.26.4; (sys_platform == "darwin" and platform_machine == "x86_64")
2 changes: 1 addition & 1 deletion examples/monai-2D-mednist/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Prerequisites

Using FEDn Studio:

- `Python 3.8, 3.9, 3.10 or 3.11 <https://www.python.org/downloads>`__
- `Python 3.9, 3.10 or 3.11 <https://www.python.org/downloads>`__
- `A FEDn Studio account <https://fedn.scaleoutsystems.com/signup>`__


Expand Down
3 changes: 1 addition & 2 deletions examples/monai-2D-mednist/client/python_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- torch==2.2.2; sys_platform == "darwin" and platform_machine == "x86_64"
- torchvision==0.19.1; (sys_platform == "darwin" and platform_machine == "arm64") or (sys_platform == "win32" or sys_platform == "win64" or sys_platform == "linux")
- torchvision==0.17.2; sys_platform == "darwin" and platform_machine == "x86_64"
- numpy==1.26.4; python_version >= "3.9"
- numpy==1.24.4; python_version == "3.8"
- numpy==1.26.4
- monai-weekly[pillow, tqdm]
- scikit-learn
3 changes: 0 additions & 3 deletions fedn/utils/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ def _exec_cmd(

env = env if extra_env is None else {**os.environ, **extra_env}

# In Python < 3.8, `subprocess.Popen` doesn't accept a command containing path-like
# objects (e.g. `["ls", pathlib.Path("abc")]`) on Windows. To avoid this issue,
# stringify all elements in `cmd`. Note `str(pathlib.Path("abc"))` returns 'abc'.
if isinstance(cmd, list):
cmd = list(map(str, cmd))

Expand Down
13 changes: 6 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "fedn"
version = "0.19.0"
version = "0.20.0"
description = "Scaleout Federated Learning"
authors = [{ name = "Scaleout Systems AB", email = "[email protected]" }]
readme = "README.rst"
Expand All @@ -20,30 +20,29 @@ keywords = [
]
classifiers = [
"Natural Language :: English",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]

requires-python = '>=3.8,<3.13'
requires-python = '>=3.9,<3.13'
dependencies = [
"requests",
"urllib3>=1.26.4",
"gunicorn>=20.0.4",
"minio",
"grpcio>=1.60,<1.67",
"grpcio-tools>=1.60,<1.67",
"grpcio>=1.60,<1.69",
"grpcio-tools>=1.60,<1.69",
"numpy>=1.21.6",
"protobuf>=5.0.0,<5.29.0",
"pymongo",
"Flask==3.0.3",
"Flask==3.1.0",
"pyjwt",
"pyopenssl",
"psutil",
"click==8.1.7",
"grpcio-health-checking>=1.60,<1.67",
"grpcio-health-checking>=1.60,<1.69",
"pyyaml",
"plotly",
"virtualenv",
Expand Down

0 comments on commit 4bf9003

Please sign in to comment.