Skip to content
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

Bump Python version to 3.9 - 3.11 #1189

Merged
merged 35 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
20152c9
removed python version <= 3.8
tanwarsh Dec 4, 2024
73643ed
changes as per comments
tanwarsh Dec 4, 2024
13a36ea
revert changes
tanwarsh Dec 4, 2024
28d8ea5
doc updated
tanwarsh Dec 4, 2024
bf7c799
Merge branch 'develop' into 4-Dec-24
tanwarsh Dec 5, 2024
8932d4c
python version updated to 3.10 to 3.12
tanwarsh Dec 5, 2024
e0dac41
python version updated to 3.10 to 3.12
tanwarsh Dec 5, 2024
e310ea1
dummy commit
tanwarsh Dec 5, 2024
2657834
dummy commit
tanwarsh Dec 5, 2024
d3cc37e
version changes
tanwarsh Dec 5, 2024
f9dc843
changed version t0 3.10
tanwarsh Dec 5, 2024
b7b47df
fixed typo
tanwarsh Dec 5, 2024
6da85d3
bump tensorflow to 2.14
tanwarsh Dec 5, 2024
d82ad49
Merge branch 'develop' into 4-Dec-24
tanwarsh Dec 5, 2024
9ad569a
bump tensorflow to 2.15
tanwarsh Dec 6, 2024
7421ca5
Merge branch '4-Dec-24' of https://github.com/tanwarsh/openfl into 4-…
tanwarsh Dec 6, 2024
960f567
Merge branch 'develop' into 4-Dec-24
tanwarsh Dec 6, 2024
7aef2dc
revert tensorflo version and removed python version 3.12
tanwarsh Dec 6, 2024
aab9ff0
revert tensorflo version and removed python version 3.12
tanwarsh Dec 6, 2024
d29530c
Merge branch 'develop' into 4-Dec-24
tanwarsh Dec 6, 2024
3010b30
removed astor
tanwarsh Dec 6, 2024
ce7676b
Merge branch '4-Dec-24' of https://github.com/tanwarsh/openfl into 4-…
tanwarsh Dec 6, 2024
8c2b8ff
Merge branch 'develop' into 4-Dec-24
tanwarsh Dec 9, 2024
423ab4d
added nbformat lib
tanwarsh Dec 9, 2024
c35e577
formatting fix
tanwarsh Dec 9, 2024
9196cf8
numpy version fix
tanwarsh Dec 9, 2024
27ccb2f
numpy version fix
tanwarsh Dec 9, 2024
34308e6
revert python version back to 3.9
tanwarsh Dec 9, 2024
c9aa62e
removed astor
tanwarsh Dec 9, 2024
bf0226a
Merge branch 'develop' into 4-Dec-24
tanwarsh Dec 10, 2024
b15835d
numpy version change
tanwarsh Dec 10, 2024
efc5571
numpy version change
tanwarsh Dec 10, 2024
fbc1917
numpy version change
tanwarsh Dec 10, 2024
4e6f76f
Merge branch 'develop' into 4-Dec-24
tanwarsh Dec 11, 2024
0ee4b80
switch to torch_cnn_mnist
tanwarsh Dec 11, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/docker-bench-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/double_ws_export.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/experimental_workflow_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install linters
run: |
python -m pip install --upgrade pip
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -40,10 +40,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/straggler-handling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/task_runner_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
# There are open issues for some of the models, so excluding them for now:
# model_name: [ "torch_cnn_mnist", "keras_cnn_mnist", "torch_cnn_histology" ]
model_name: ["torch_cnn_mnist", "keras_cnn_mnist"]
python_version: ["3.8", "3.9", "3.10"]
python_version: ["3.10", "3.11"]
fail-fast: false # do not immediately fail if one of the combinations fail

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/taskrunner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'windows-latest']
python-version: ['3.8','3.9','3.10','3.11']
python-version: ['3.10','3.11']
runs-on: ${{ matrix.os }}
timeout-minutes: 15

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/taskrunner_eden_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tr_docker_gramine_direct.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tr_docker_native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -41,10 +41,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
timeout-minutes: 15
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -38,10 +38,10 @@ jobs:
timeout-minutes: 15
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.8
- name: Set up Python 3
uses: actions/setup-python@v3
with:
python-version: "3.8"
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ pipeline {
SNYK_ALLOW_LONG_PROJECT_NAME = true
SNYK_USE_MULTI_PROC = true
SNYK_DEBUG = true
SNYK_PYTHON_VERSION = '3.8'
SNYK_PYTHON_VERSION = '3.10'

BANDIT_SOURCE_PATH = 'openfl/ openfl-workspace/ openfl-tutorials/'
BANDIT_SEVERITY_LEVEL = 'high'
Expand Down Expand Up @@ -114,7 +114,7 @@ pipeline {
stage('Build Package') {
agent {
docker {
image 'python:3.8'
image 'python:3.10'
}
}
steps {
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<img src="https://github.com/securefederatedai/artwork/blob/main/PNG/OpenFL%20Logo%20-%20color.png?raw=true">
</div>

[![PyPI - Python Version](https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10-blue)](https://pypi.org/project/openfl/)

[![PyPI - Python Version](https://img.shields.io/badge/python-3.10%20%7C%203.11-blue)](https://pypi.org/project/openfl/)
[![Ubuntu CI status](https://github.com/securefederatedai/openfl/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/securefederatedai/openfl/actions/workflows/ubuntu.yml)
[![Windows CI status](https://github.com/securefederatedai/openfl/actions/workflows/windows.yml/badge.svg)](https://github.com/securefederatedai/openfl/actions/workflows/windows.yml)
[![Documentation Status](https://readthedocs.org/projects/openfl/badge/?version=latest)](https://openfl.readthedocs.io/en/latest/?badge=latest)
Expand Down
2 changes: 1 addition & 1 deletion docs/about/features_index/taskrunner.rst
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Bare Metal Approach
STEP 1: Create a Workspace
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1. Start a Python 3.8 (>=3.6, <3.11) virtual environment and confirm |productName| is available.
1. Start a Python 3.10 (>=3.10, <3.12) virtual environment and confirm |productName| is available.

.. code-block:: console

Expand Down
2 changes: 1 addition & 1 deletion docs/developer_guide/running_the_federation.notebook.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ You will start a Jupyter\* \ lab server and receive a URL you can use to access
Start the Tutorials
===================

1. Start a Python\* \ 3.8 (>=3.6, <3.9) virtual environment and confirm |productName| is available.
1. Start a Python\* \ 3.10 (>=3.10, <3.12) virtual environment and confirm |productName| is available.

.. code-block:: python

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ However, continue with the following procedure for details in creating a federat
STEP 1: Install GaNDLF prerequisites and Create a Workspace
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1. Start a Python 3.8 (>=3.7, <3.11) virtual environment and confirm |productName| is available.
1. Start a Python 3.10 (>=3.10, <3.12) virtual environment and confirm |productName| is available.

.. code-block:: python

Expand Down
2 changes: 1 addition & 1 deletion docs/get_started/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Install the Package
Follow this procedure to prepare the environment and install the |productName| package.
Perform this procedure on every node in the federation.

1. Install a Python 3.8 (>=3.6, <3.9) virtual environment using venv.
1. Install a Python 3.10 (>=3.10, <3.12) virtual environment using venv.

See the `Venv installation guide <https://docs.python.org/3/library/venv.html>`_ for details.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
astor==0.8.1
chardet
charset-normalizer
dill==0.3.6
Expand Down
7 changes: 3 additions & 4 deletions openfl/experimental/workflow/workspace_export/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from pathlib import Path
from shutil import copytree

import astor
import nbformat
import yaml
from nbdev.export import nb_export
Expand Down Expand Up @@ -194,13 +193,13 @@ def __extract_class_initializing_args(self, class_name): # noqa: C901
# Use the variable name as the argument value
instantiation_args["args"][arg.id] = arg.id
elif isinstance(arg, ast.Constant):
instantiation_args["args"][arg.s] = astor.to_source(arg)
instantiation_args["args"][arg.s] = ast.unparse(arg)
else:
instantiation_args["args"][arg.arg] = astor.to_source(arg).strip()
instantiation_args["args"][arg.arg] = ast.unparse(arg).strip()

for kwarg in node.keywords:
# Iterate through keyword arguments
value = astor.to_source(kwarg.value).strip()
value = ast.unparse(kwarg.value).strip()

# If paranthese or brackets around the value is
# found and it's not tuple or list remove
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def run(self):
'protobuf>=4.22,<6.0.0',
'grpcio>=1.56.2,<1.66.0',
],
python_requires='>=3.8, <3.12',
python_requires='>=3.10, <3.12',
tanwarsh marked this conversation as resolved.
Show resolved Hide resolved
project_urls={
'Bug Tracker': 'https://github.com/securefederatedai/openfl/issues',
'Documentation': 'https://openfl.readthedocs.io/en/stable/',
Expand All @@ -101,8 +101,6 @@ def run(self):
'Topic :: System :: Distributed Computing',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
],
Expand Down
Loading