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 versions to latest patch versions #1526

Merged
merged 9 commits into from
Dec 30, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

# https://code.visualstudio.com/docs/remote/containers-advanced#_creating-a-nonroot-user
ARG USERNAME=flwr-vscode
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/baselines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ defaults:

jobs:
test_baselines:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8.12
python-version: 3.8.15
- name: Install build tools
run: |
python -m pip install -U pip==22.3.1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ on:

jobs:
build_docs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Build docs
uses: actions/setup-python@v4
with:
python-version: 3.7.12
python-version: 3.7.15
- name: Install build tools
run: |
sudo apt install pandoc
Expand All @@ -36,13 +36,13 @@ jobs:
deploy_docs:
needs: build_docs
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Deploy docs
uses: actions/setup-python@v4
with:
python-version: 3.7.12
python-version: 3.7.15
- name: Install build tools
run: |
sudo apt install pandoc
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ on:

jobs:
test_quickstart_pytorch:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.7.12
python-version: 3.7.15
- name: Install
run: |
python -m pip install -U pip==22.3.1
Expand Down Expand Up @@ -67,13 +67,13 @@ jobs:
killall python

test_quickstart_tensorflow:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.7.12
python-version: 3.7.15
- name: Install
run: |
python -m pip install -U pip==22.3.1
Expand Down Expand Up @@ -123,13 +123,13 @@ jobs:
killall python

test_pytorch_from_centralized_to_federated:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.7.12
python-version: 3.7.15
- name: Install
run: |
python -m pip install -U pip==22.3.1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flower.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ on:

jobs:
test_core:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
python: [3.7.12, 3.8.12, 3.9.10, 3.10.5]
python: [3.7.15, 3.8.15, 3.9.16, 3.10.9]
steps:
- uses: actions/checkout@v3
- name: Set up Python
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flower_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ on:

jobs:
nightly_release:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.7.12
python-version: 3.7.15
- name: Install build tools
run: |
python -m pip install -U pip==22.3.1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flower_tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ on:

jobs:
test_tools:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.7.12
python-version: 3.7.15
- name: Install build tools
run: |
python -m pip install -U pip==22.3.1
Expand Down
2 changes: 1 addition & 1 deletion baselines/dev/setup-defaults.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

version=${1:-3.7.12}
version=${1:-3.8.16}
charlesbvll marked this conversation as resolved.
Show resolved Hide resolved

# To install pyenv and virtualenv plugin
function install_pyenv(){
Expand Down
2 changes: 1 addition & 1 deletion baselines/dev/venv-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e
cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../

version=${1:-3.7.12}
version=${1:-3.8.16}
charlesbvll marked this conversation as resolved.
Show resolved Hide resolved

# Check if the directory for the Python version does not exist and if so,
# install the right Python version through pyenv
Expand Down
2 changes: 1 addition & 1 deletion baselines/dev/venv-delete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
set -e
cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../

version=${1:-3.7.12}
version=${1:-3.8.16}
charlesbvll marked this conversation as resolved.
Show resolved Hide resolved

pyenv uninstall -f baselines-$version
2 changes: 1 addition & 1 deletion baselines/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ classifiers = [
]

[tool.poetry.dependencies]
python = "^3.7.12"
python = "^3.8.16"
charlesbvll marked this conversation as resolved.
Show resolved Hide resolved
# Mandatory dependencies
flwr = { extras = ["simulation"], version = "==1.0.0" }
torch = "^1.10.1"
Expand Down
2 changes: 1 addition & 1 deletion dev/setup-defaults.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -e

version=${1:-3.7.12}
version=${1:-3.7.15}

# To install pyenv and virtualenv plugin
function install_pyenv(){
Expand Down
2 changes: 1 addition & 1 deletion dev/venv-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e
cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../

version=${1:-3.7.12}
version=${1:-3.7.15}

# Check if the directory for the Python version does not exist and if so,
# install the right Python version through pyenv
Expand Down
2 changes: 1 addition & 1 deletion dev/venv-delete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
set -e
cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../

version=${1:-3.7.12}
version=${1:-3.7.15}

pyenv uninstall -f flower-$version
2 changes: 1 addition & 1 deletion doc/source/getting-started-for-contributors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ following convenience script::
Third, install the Flower package in development mode (think
:code:`pip install -e`) along with all necessary dependencies::

(flower-3.7.12) $ ./dev/bootstrap.sh
(flower-3.7.15) $ ./dev/bootstrap.sh


Convenience Scripts
Expand Down
4 changes: 2 additions & 2 deletions doc/source/tutorial/Flower-1-Intro-to-FL-PyTorch.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -677,13 +677,13 @@
"toc_visible": true
},
"kernelspec": {
"display_name": "Python 3.7.12 64-bit ('flower-3.7.12')",
"display_name": "Python 3.7.15 64-bit ('flower-3.7.15')",
charlesbvll marked this conversation as resolved.
Show resolved Hide resolved
"language": "python",
"name": "python3"
},
"language_info": {
"name": "python",
"version": "3.7.12"
"version": "3.7.15"
},
"vscode": {
"interpreter": {
Expand Down
4 changes: 2 additions & 2 deletions doc/source/tutorial/Flower-2-Strategies-in-FL-PyTorch.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -680,13 +680,13 @@
"toc_visible": true
},
"kernelspec": {
"display_name": "Python 3.7.12 64-bit ('flower-3.7.12')",
"display_name": "Python 3.7.15 64-bit ('flower-3.7.15')",
"language": "python",
"name": "python3"
},
"language_info": {
"name": "python",
"version": "3.7.12"
"version": "3.7.15"
},
"vscode": {
"interpreter": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
"toc_visible": true
},
"kernelspec": {
"display_name": "Python 3.7.12 64-bit ('flower-3.7.12')",
"display_name": "Python 3.7.15 64-bit ('flower-3.7.15')",
"language": "python",
"name": "python3"
},
Expand All @@ -468,7 +468,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.12"
"version": "3.7.15"
},
"vscode": {
"interpreter": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -508,13 +508,13 @@
"toc_visible": true
},
"kernelspec": {
"display_name": "Python 3.7.12 64-bit ('flower-3.7.12')",
"display_name": "Python 3.7.15 64-bit ('flower-3.7.15')",
"language": "python",
"name": "python3"
},
"language_info": {
"name": "python",
"version": "3.7.12"
"version": "3.7.15"
},
"vscode": {
"interpreter": {
Expand Down
4 changes: 2 additions & 2 deletions examples/simulation_tensorflow/sim.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@
"provenance": []
},
"kernelspec": {
"display_name": "Python 3.8.12 ('.venv': poetry)",
"display_name": "Python 3.8.16 ('.venv': poetry)",
"language": "python",
"name": "python3"
},
"language_info": {
"name": "python",
"version": "3.8.12"
"version": "3.8.16"
},
"vscode": {
"interpreter": {
Expand Down
2 changes: 1 addition & 1 deletion src/docker/default.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7.12-slim-stretch
FROM python:3.7.15-slim-buster

# Install the biggest dependencies before copying the wheel
RUN pip install tensorflow-cpu==2.6.2 numpy==1.19.5
Expand Down
2 changes: 1 addition & 1 deletion src/docker/sshd.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7.12-slim-stretch
FROM python:3.7.15-slim-buster

RUN apt-get update
RUN apt-get install -y openssh-server screen
Expand Down