Skip to content

Commit

Permalink
Upgrade to Poetry 1.3.2 (#1549)
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesbvll authored Jan 10, 2023
1 parent 812b329 commit c961bc7
Show file tree
Hide file tree
Showing 32 changed files with 35 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN apt install -y curl wget gnupg python3 python-is-python3 python3-pip git \
RUN python -m pip install \
pip==22.3.1 \
setuptools==65.6.3 \
poetry==1.2.2
poetry==1.3.2

USER $USERNAME
ENV PATH="/home/$USERNAME/.local/bin:${PATH}"
2 changes: 1 addition & 1 deletion .github/workflows/baselines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install -U poetry==1.2.2
python -m pip install -U poetry==1.3.2
poetry config virtualenvs.create false
- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
sudo apt install pandoc
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install -U poetry==1.2.2
python -m pip install -U poetry==1.3.2
poetry config virtualenvs.create false
- name: Install dependencies (mandatory only)
run: python -m poetry install --extras "simulation"
Expand All @@ -48,7 +48,7 @@ jobs:
sudo apt install pandoc
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install -U poetry==1.2.2
python -m pip install -U poetry==1.3.2
poetry config virtualenvs.create false
- name: Install dependencies (mandatory only)
run: python -m poetry install --extras "simulation"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: |
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install poetry==1.2.2
python -m pip install poetry==1.3.2
poetry config virtualenvs.create false
- name: Install dependencies
run: |
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
run: |
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install poetry==1.2.2
python -m pip install poetry==1.3.2
poetry config virtualenvs.create false
- name: Install dependencies
run: |
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
run: |
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install poetry==1.2.2
python -m pip install poetry==1.3.2
poetry config virtualenvs.create false
- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flower.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
sudo apt-get install clang-format
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install -U poetry==1.2.2
python -m pip install -U poetry==1.3.2
poetry config virtualenvs.create false
- name: Install dependencies (mandatory only)
run: python -m poetry install --extras "simulation"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flower_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: |
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install -U poetry==1.2.2
python -m pip install -U poetry==1.3.2
- name: Release nightly
env:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flower_tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install -U poetry==1.2.2
python -m pip install -U poetry==1.3.2
poetry config virtualenvs.create false
- name: Install dependencies (mandatory + optional)
run: |
Expand Down
2 changes: 1 addition & 1 deletion baselines/dev/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../
# Upgrade/install spcific versions of `pip`, `setuptools`, and `poetry`
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install -U poetry==1.2.2
python -m pip install -U poetry==1.3.2

# Use `poetry` to install project dependencies
python -m poetry install
4 changes: 1 addition & 3 deletions baselines/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion dev/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../
# Upgrade/install spcific versions of `pip`, `setuptools`, and `poetry`
python -m pip install -U pip==22.3.1
python -m pip install -U setuptools==65.6.3
python -m pip install -U poetry==1.2.2
python -m pip install -U poetry==1.3.2

# Use `poetry` to install project dependencies
python -m poetry install \
Expand Down
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 @@ -5,7 +5,7 @@ Prerequisites
-------------

- `Python 3.7 <https://docs.python.org/3.7/>`_ or above
- `Poetry 1.0 <https://python-poetry.org/>`_ or above
- `Poetry 1.3 <https://python-poetry.org/>`_ or above
- (Optional) `pyenv <https://github.com/pyenv/pyenv>`_
- (Optional) `pyenv-virtualenv <https://github.com/pyenv/pyenv-virtualenv>`_

Expand Down
2 changes: 1 addition & 1 deletion examples/advanced_pytorch/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced_tensorflow/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
4 changes: 1 addition & 3 deletions examples/android/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.masonry.api"

[tool.poetry]
Expand Down
4 changes: 1 addition & 3 deletions examples/dp-sgd-mnist/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion examples/mt-pytorch/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
4 changes: 1 addition & 3 deletions examples/mxnet_from_centralized_to_federated/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
4 changes: 1 addition & 3 deletions examples/opacus/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ torch = "^1.9.0"
torchvision = "^0.10.0"

[build-system]
requires = ["poetry-core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart_huggingface/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
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 @@ -13,5 +13,5 @@ scikit-learn = "^1.1.1"
numpy = "^1.21.4"

[build-system]
requires = ["poetry-core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"
4 changes: 1 addition & 3 deletions examples/quickstart_mlcube/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.masonry.api"

[tool.poetry]
Expand Down
4 changes: 1 addition & 3 deletions examples/quickstart_mxnet/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart_pandas/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart_pytorch/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
4 changes: 1 addition & 3 deletions examples/quickstart_pytorch_lightning/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart_tensorflow/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion examples/simulation_pytorch/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion examples/simulation_tensorflow/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
4 changes: 1 addition & 3 deletions examples/sklearn-logreg-mnist/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[build-system]
requires = [
"poetry==1.2.2",
]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["poetry_core>=1.0.0"]
requires = ["poetry-core>=1.4.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
Expand Down

0 comments on commit c961bc7

Please sign in to comment.