Skip to content

Commit

Permalink
Merge pull request #2 from rafaelaBrum/update_version
Browse files Browse the repository at this point in the history
Update version from 0.17.0 to 0.19.0
  • Loading branch information
rafaelaBrum authored Jul 15, 2022
2 parents 049ae99 + 5cf32d5 commit 0d5861b
Show file tree
Hide file tree
Showing 401 changed files with 20,590 additions and 2,863 deletions.
37 changes: 37 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
FROM ubuntu:20.04

# https://code.visualstudio.com/docs/remote/containers-advanced#_creating-a-nonroot-user
ARG USERNAME=flwr-vscode
ARG USER_UID=1000
ARG USER_GID=$USER_UID

# Create the user
RUN groupadd --gid $USER_GID $USERNAME \
&& useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
#
# [Optional] Add sudo support. Omit if you don't need to install software after connecting.
&& apt-get update \
&& apt-get install -y sudo bash \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME

# A persistent volume will be configured in devcontainer.json so we don't loose the commandhistory
# after rebuilding the container
RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhistory/.bash_history" \
&& mkdir /commandhistory \
&& touch /commandhistory/.bash_history \
&& chown -R $USERNAME /commandhistory \
&& echo $SNIPPET >> "/home/$USERNAME/.bashrc"

# Install system dependencies
RUN apt update
RUN apt install -y curl wget gnupg python3 python-is-python3 python3-pip git \
build-essential clang-format tmux vim

RUN python -m pip install \
pip==22.0.4 \
setuptools==60.9.3 \
poetry==1.1.13

USER $USERNAME
ENV PATH="/home/$USERNAME/.local/bin:${PATH}"
17 changes: 17 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"dockerFile": "Dockerfile",
"postCreateCommand": "poetry install --extras \"simulation\"",
"extensions": ["ms-python.python"],
"settings": {
"files.watcherExclude": {},
"search.exclude": {},
"terminal.integrated.defaultProfile.linux": "bash"
},
"remoteUser": "flwr-vscode",
"containerEnv": {
"POETRY_VIRTUALENVS_CREATE": "false"
},
"mounts": [
"source=flwr-bashhistory,target=/commandhistory,type=volume"
]
}
3 changes: 1 addition & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ indent_style = space
indent_size = 2

[*.py]
indent_style = space
indent_size = 4
profile = black

[*.rst]
indent_style = space
Expand Down
51 changes: 51 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Bug Report
description: Create a report to help us reproduce and correct the bug
labels: ['bug']

body:
- type: markdown
attributes:
value: >
#### Before submitting a bug, please make sure the issue hasn't been already
addressed by searching through [the past issues](https://github.com/adap/flower/issues).
Please also go through the Flower Slack channel if a similar behavior is already appeared and a solution is already given.
- type: textarea
attributes:
label: Describe the bug
description: >
A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
attributes:
label: Steps/Code to Reproduce
description: |
Please add a minimal code example that can reproduce the error when running it.
placeholder: |
```
Sample code to reproduce the problem
```
validations:
required: true
- type: textarea
attributes:
label: Expected Results
description: >
Please paste or describe the expected results.
placeholder: >
Example: The server aggregated the weights from all clients.
validations:
required: true
- type: textarea
attributes:
label: Actual Results
description: |
Please paste or describe the results you observe instead of the expected results. If you observe an error, please paste the error message including the **full traceback** of the exception.
placeholder: >
Please paste or specifically describe the actual output or traceback.
validations:
required: true
- type: markdown
attributes:
value: >
Thanks for contributing!
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
blank_issues_enabled: false
contact_links:
- name: Slack Channel
url: https://flower.dev/join-slack
about: Connect with other Flower users and contributors and discuss with them or ask them questions.
- name: Discussion
url: https://github.com/adap/flower/discussions
about: Ask about new features or general questions. Please use the discussion area in most of the cases instead of the issues.
- name: Flower Issues
url: https://github.com/adap/flower/issues
about: Contribute new features/enhancements, report bugs, or improve the documentation.
- name: Flower Mail
url: https://flower.dev/
about: If your project needs professional support please contact the Flower team ([email protected]).
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/doc_improvement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Improve Documentation
description: Create an issue/PR to help us improve the documentation. You can use the issue to report an improvement or directly open a PR with the suggested change.
labels: ['documentation']

body:
- type: markdown
attributes:
value: >
#### We are happy that you want to improve the documentation. Please contact us if you are planning to add a new chapter or blog post.
- type: textarea
attributes:
label: Describe what the documentation is missing.
description: >
Which part of the documentation needs improvement?
validations:
required: true
- type: textarea
attributes:
label: Suggest your improvement.
description: >
What information do you want to change/add?
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Feature request
description: Suggest a new baseline, strategy, example, ...
labels: ['feature request']

body:
- type: markdown
attributes:
value: >
#### If you want to propose a new feature, please check the PRs if someone already works on this feature.
- type: textarea
attributes:
label: Describe the type of feature and its functionality.
validations:
required: true
- type: textarea
attributes:
label: Describe step by step what files and adjustments are you planning to include.
validations:
required: true
- type: textarea
attributes:
label: Is there something else you want to add?
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Question
description: Do you have questions? Please check our Flower Slack channel or the Flower Discussion.
labels: ['question']

body:
- type: markdown
attributes:
value: >
#### Please start a discussion in the Flower discussion before submitting an issue https://github.com/adap/flower/discussions. Only submit a question to the issues if you have not received a reply on the Flower Slack channel or within the discussion area.
- type: textarea
attributes:
label: What is your question?
validations:
required: true
34 changes: 34 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!--
Thanks for contributing a pull request! Please ensure you have taken a look at
the contribution guidelines: https://github.com/adap/flower/blob/main/CONTRIBUTING.md
Does the changelog need to be updated?
See: https://github.com/adap/flower/blob/main/doc/source/changelog.rst
-->

#### Reference Issues/PRs

<!--
Example: Fixes #1234. See also #3456.
Please use keywords (e.g., Fixes) to create a link to the issues or pull requests
you resolved.
-->

#### What does this implement/fix? Explain your changes.

<!--
Explain why this PR is needed and what kind of changes have you done.
Example: the variable rnd was not clear and therefore renamed to fl_round.
-->

#### Any other comments?


<!--
Please be aware that it may take some time until we can check this PR.
If you have an urgent request or question please use the Flower Slack channel.
The Slack channel is really active and contributors respond pretty fast.
We value your contribution and are aware of the time you put into this PR.
Therefore, thank you for your contribution.
-->
14 changes: 7 additions & 7 deletions .github/workflows/baselines.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test Baselines
name: Baselines

on:
push:
Expand All @@ -13,19 +13,19 @@ defaults:
working-directory: baselines

jobs:
test:
runs-on: ubuntu-18.04
test_baselines:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8.3
python-version: 3.8.12
- name: Install build tools
run: |
python -m pip install -U pip==21.1.1
python -m pip install -U setuptools==56.2.0
python -m pip install -U poetry==1.1.6
python -m pip install -U pip==22.0.4
python -m pip install -U setuptools==60.9.3
python -m pip install -U poetry==1.1.13
poetry config virtualenvs.create false
- name: Install dependencies
run: |
Expand Down
40 changes: 34 additions & 6 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,52 @@ on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
build_docs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Build docs
uses: actions/setup-python@v2
with:
python-version: 3.7.12
- name: Install build tools
run: |
python -m pip install -U pip==22.0.4
python -m pip install -U setuptools==60.9.3
python -m pip install -U poetry==1.1.13
poetry config virtualenvs.create false
- name: Install dependencies (mandatory only)
run: python -m poetry install --extras "simulation"
- name: Build and deploy docs
env:
AWS_DEFAULT_REGION: ${{ secrets. AWS_DEFAULT_REGION }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets. AWS_SECRET_ACCESS_KEY }}
run: ./dev/build-docs.sh

deploy_docs:
runs-on: ubuntu-18.04
needs: build_docs
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Deploy docs
uses: actions/setup-python@v2
with:
python-version: 3.7.9
python-version: 3.7.12
- name: Install build tools
run: |
python -m pip install -U pip==21.1.1
python -m pip install -U setuptools==56.2.0
python -m pip install -U poetry==1.1.6
python -m pip install -U pip==22.0.4
python -m pip install -U setuptools==60.9.3
python -m pip install -U poetry==1.1.13
poetry config virtualenvs.create false
- name: Install dependencies (mandatory only)
run: python -m poetry install --extras "baseline examples-tensorflow examples-pytorch http-logger ops"
run: python -m poetry install --extras "simulation"
- name: Build and deploy docs
env:
AWS_DEFAULT_REGION: ${{ secrets. AWS_DEFAULT_REGION }}
Expand Down
Loading

0 comments on commit 0d5861b

Please sign in to comment.