Skip to content

Commit 1ff684b

Browse files
mshellermsheller
authored
Merge branch 'main' into add-token-auth-interceptors
2 parents 8d69379 + 393782f commit 1ff684b

File tree

165 files changed

+7030
-5641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+7030
-5641
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
attributes:
1111
value: >
1212
#### Before submitting a bug, please make sure the issue hasn't been already
13-
addressed by searching through [the past issues](https://github.com/adap/flower/issues).
13+
addressed by searching through [the past issues](https://github.com/flwrlabs/flower/issues).
1414
Please also go through the Flower Slack channel if a similar behavior already appeared and a solution was already given.
1515
1616
- type: textarea

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Thank you for opening a pull request (PR)!
33
44
Please rename your PRs following this [format](https://flower.ai/docs/framework/contributor-tutorial-contribute-on-github.html#pr-title-format).
5-
Contribution guidelines: https://github.com/adap/flower/blob/main/CONTRIBUTING.md
5+
Contribution guidelines: https://github.com/flwrlabs/flower/blob/main/CONTRIBUTING.md
66
-->
77

88
## Issue

‎.github/workflows/baselines.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ env:
1717

1818
jobs:
1919
changes:
20+
# To re-enable, remove `if: false` from the changes job.
21+
if: ${{ false }}
2022
runs-on: ubuntu-22.04
2123
permissions:
2224
pull-requests: read

‎.github/workflows/build-deploy-non-framework-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Build hub docs
5656
run: ./dev/build-hub-docs.sh
5757
- name: Deploy docs
58-
if: ${{ github.ref == 'refs/heads/main' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
58+
if: ${{ github.ref == 'refs/heads/main' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork }}
5959
env:
6060
AWS_DEFAULT_REGION: ${{ secrets.DOCS_AWS_DEFAULT_REGION }}
6161
AWS_ACCESS_KEY_ID: ${{ secrets.DOCS_AWS_ACCESS_KEY_ID }}

‎.github/workflows/framework-docker-build-main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
parameters:
10-
if: github.repository == 'adap/flower'
10+
if: github.repository == 'flwrlabs/flower'
1111
name: Collect docker build parameters
1212
runs-on: ubuntu-22.04
1313
timeout-minutes: 10
@@ -31,7 +31,7 @@ jobs:
3131
3232
build-docker-base-images:
3333
name: Build base images
34-
if: github.repository == 'adap/flower'
34+
if: github.repository == 'flwrlabs/flower'
3535
uses: ./.github/workflows/_docker-build.yml
3636
needs: parameters
3737
strategy:
@@ -51,7 +51,7 @@ jobs:
5151

5252
build-docker-binary-images:
5353
name: Build binary images
54-
if: github.repository == 'adap/flower'
54+
if: github.repository == 'flwrlabs/flower'
5555
uses: ./.github/workflows/_docker-build.yml
5656
needs: [parameters, build-docker-base-images]
5757
strategy:

‎.github/workflows/framework-docker-readme.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
collect:
12-
if: ${{ github.repository == 'adap/flower' }}
12+
if: ${{ github.repository == 'flwrlabs/flower' }}
1313
name: Collect Docker READMEs
1414
runs-on: ubuntu-22.04
1515
timeout-minutes: 10

‎.github/workflows/framework-docs-dispatch-release-branches.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818

1919
jobs:
2020
dispatch-release-docs-builds:
21-
if: ${{ github.repository == 'adap/flower' }}
21+
if: ${{ github.repository == 'flwrlabs/flower' }}
2222
runs-on: ubuntu-22.04
2323

2424
steps:
@@ -31,12 +31,12 @@ jobs:
3131
set -euo pipefail
3232
3333
# Fetch all branches and keep only release/framework-* ones
34-
branches=$(gh api repos/adap/flower/branches \
34+
branches=$(gh api repos/flwrlabs/flower/branches \
3535
--paginate \
3636
--jq '.[].name' | grep '^release/framework-' || true)
3737
3838
# Dispatch docs workflow on each release branch
3939
for branch in $branches; do
4040
echo "Dispatching on $branch"
41-
gh workflow run framework-docs.yml --repo adap/flower --ref "$branch"
41+
gh workflow run framework-docs.yml --repo flwrlabs/flower --ref "$branch"
4242
done

‎.github/workflows/framework-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
echo "Building docs for version: ${DOC_VERSION}"
9090
./framework/dev/build-docs.sh full
9191
- name: Determine if this is the latest stable version
92-
if: ${{ github.repository == 'adap/flower' && ((startsWith(github.ref, 'refs/heads/release/framework-') && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')) || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/framework-'))) }}
92+
if: ${{ github.repository == 'flwrlabs/flower' && ((startsWith(github.ref, 'refs/heads/release/framework-') && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')) || (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/framework-'))) }}
9393
id: latest_check
9494
run: |
9595
# Get all framework version tags and find the latest one
@@ -113,7 +113,7 @@ jobs:
113113
echo "Not the latest stable version. Current: $current_branch, Latest: $latest_major_minor"
114114
fi
115115
- name: Deploy docs HTML
116-
if: ${{ github.repository == 'adap/flower' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release') }}
116+
if: ${{ github.repository == 'flwrlabs/flower' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release') }}
117117
env:
118118
AWS_DEFAULT_REGION: ${{ secrets.DOCS_AWS_DEFAULT_REGION }}
119119
AWS_ACCESS_KEY_ID: ${{ secrets.DOCS_AWS_ACCESS_KEY_ID }}
@@ -129,7 +129,7 @@ jobs:
129129
aws s3 sync --exclude ".*" --cache-control "no-cache" ./framework/docs/build/html/${DOC_VERSION}/en/ s3://${{ secrets.DOCS_AWS_BUCKET_NAME }}/docs/framework/
130130
fi
131131
- name: Generate and deploy shared docs UI metadata from main
132-
if: ${{ github.repository == 'adap/flower' && (github.ref == 'refs/heads/main' || github.event_name == 'release') }}
132+
if: ${{ github.repository == 'flwrlabs/flower' && (github.ref == 'refs/heads/main' || github.event_name == 'release') }}
133133
env:
134134
AWS_DEFAULT_REGION: ${{ secrets.DOCS_AWS_DEFAULT_REGION }}
135135
AWS_ACCESS_KEY_ID: ${{ secrets.DOCS_AWS_ACCESS_KEY_ID }}

‎.github/workflows/framework-draft-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010

1111
jobs:
1212
publish:
13-
if: ${{ github.repository == 'adap/flower' }}
13+
if: ${{ github.repository == 'flwrlabs/flower' }}
1414
name: Publish draft
1515
runs-on: ubuntu-22.04
1616
steps:

‎.github/workflows/framework-e2e.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Test wheel
5454
run: ./framework/dev/test-wheel.sh
5555
- name: Upload wheel
56-
if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
56+
if: ${{ github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
5757
id: upload
5858
env:
5959
AWS_DEFAULT_REGION: ${{ secrets.ARTIFACT_AWS_DEFAULT_REGION }}
@@ -106,7 +106,7 @@ jobs:
106106
python-version: ${{ matrix.python-version }}
107107
poetry-skip: 'true'
108108
- name: Install Flower from repo
109-
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
109+
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
110110
working-directory: ./framework
111111
run: |
112112
if [[ "${{ matrix.engine }}" == "simulation-engine" ]]; then
@@ -115,7 +115,7 @@ jobs:
115115
python -m pip install .
116116
fi
117117
- name: Download and install Flower wheel from artifact store
118-
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
118+
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
119119
run: |
120120
# Define base URL for wheel file
121121
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
@@ -223,7 +223,7 @@ jobs:
223223
if: ${{ needs.changes.outputs.framework == 'true' }}
224224
run: python -m pip install --upgrade . --extra-index-url https://download.pytorch.org/whl/cpu
225225
- name: Install Flower wheel from artifact store
226-
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
226+
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
227227
run: |
228228
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
229229
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
@@ -289,7 +289,7 @@ jobs:
289289
run: |
290290
python -m pip install --upgrade .
291291
- name: Install Flower wheel from artifact store
292-
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
292+
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
293293
run: |
294294
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
295295
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
@@ -332,12 +332,12 @@ jobs:
332332
if: ${{ needs.changes.outputs.framework == 'true' }}
333333
uses: ./.github/actions/bootstrap
334334
- name: Install Flower from repo
335-
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
335+
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
336336
run: |
337337
cd framework
338338
python -m pip install .
339339
- name: Install Flower wheel from artifact store
340-
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
340+
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
341341
run: |
342342
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
343343
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
@@ -376,12 +376,12 @@ jobs:
376376
if: ${{ needs.changes.outputs.framework == 'true' }}
377377
uses: ./.github/actions/bootstrap
378378
- name: Install Flower from repo
379-
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
379+
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
380380
run: |
381381
cd framework
382382
python -m pip install .
383383
- name: Install Flower wheel from artifact store
384-
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
384+
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
385385
run: |
386386
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
387387
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
@@ -423,12 +423,12 @@ jobs:
423423
python-version: ${{ matrix.python-version }}
424424
poetry-skip: 'true'
425425
- name: Install Flower from repo
426-
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
426+
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
427427
run: |
428428
cd framework
429429
python -m pip install .
430430
- name: Install Flower wheel from artifact store
431-
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
431+
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
432432
run: |
433433
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
434434
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
@@ -471,7 +471,7 @@ jobs:
471471
python-version: ${{ matrix.python-version }}
472472
poetry-skip: 'true'
473473
- name: Install Flower from repo
474-
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
474+
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
475475
working-directory: ./framework
476476
run: |
477477
if [[ "${{ matrix.engine }}" == "simulation-engine" ]]; then
@@ -480,7 +480,7 @@ jobs:
480480
python -m pip install . "numpy>=${{ matrix.numpy-version }},<2.0"
481481
fi
482482
- name: Download and install Flower wheel from artifact store
483-
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
483+
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
484484
run: |
485485
# Define base URL for wheel file
486486
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"

0 commit comments

Comments
 (0)