Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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 .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body:
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).
addressed by searching through [the past issues](https://github.com/flwrlabs/flower/issues).
Please also go through the Flower Slack channel if a similar behavior already appeared and a solution was already given.

- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Thank you for opening a pull request (PR)!

Please rename your PRs following this [format](https://flower.ai/docs/framework/contributor-tutorial-contribute-on-github.html#pr-title-format).
Contribution guidelines: https://github.com/adap/flower/blob/main/CONTRIBUTING.md
Contribution guidelines: https://github.com/flwrlabs/flower/blob/main/CONTRIBUTING.md
-->

## Issue
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-deploy-non-framework-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Build hub docs
run: ./dev/build-hub-docs.sh
- name: Deploy docs
if: ${{ github.ref == 'refs/heads/main' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork }}
if: ${{ github.ref == 'refs/heads/main' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork }}
env:
AWS_DEFAULT_REGION: ${{ secrets.DOCS_AWS_DEFAULT_REGION }}
AWS_ACCESS_KEY_ID: ${{ secrets.DOCS_AWS_ACCESS_KEY_ID }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/framework-docker-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
parameters:
if: github.repository == 'adap/flower'
if: github.repository == 'flwrlabs/flower'
name: Collect docker build parameters
runs-on: ubuntu-22.04
timeout-minutes: 10
Expand All @@ -31,7 +31,7 @@ jobs:

build-docker-base-images:
name: Build base images
if: github.repository == 'adap/flower'
if: github.repository == 'flwrlabs/flower'
uses: ./.github/workflows/_docker-build.yml
needs: parameters
strategy:
Expand All @@ -51,7 +51,7 @@ jobs:

build-docker-binary-images:
name: Build binary images
if: github.repository == 'adap/flower'
if: github.repository == 'flwrlabs/flower'
uses: ./.github/workflows/_docker-build.yml
needs: [parameters, build-docker-base-images]
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/framework-docker-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
collect:
if: ${{ github.repository == 'adap/flower' }}
if: ${{ github.repository == 'flwrlabs/flower' }}
name: Collect Docker READMEs
runs-on: ubuntu-22.04
timeout-minutes: 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:

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

steps:
Expand All @@ -31,12 +31,12 @@ jobs:
set -euo pipefail

# Fetch all branches and keep only release/framework-* ones
branches=$(gh api repos/adap/flower/branches \
branches=$(gh api repos/flwrlabs/flower/branches \
--paginate \
--jq '.[].name' | grep '^release/framework-' || true)

# Dispatch docs workflow on each release branch
for branch in $branches; do
echo "Dispatching on $branch"
gh workflow run framework-docs.yml --repo adap/flower --ref "$branch"
gh workflow run framework-docs.yml --repo flwrlabs/flower --ref "$branch"
done
6 changes: 3 additions & 3 deletions .github/workflows/framework-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
echo "Building docs for version: ${DOC_VERSION}"
./framework/dev/build-docs.sh full
- name: Determine if this is the latest stable version
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-'))) }}
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-'))) }}
id: latest_check
run: |
# Get all framework version tags and find the latest one
Expand All @@ -113,7 +113,7 @@ jobs:
echo "Not the latest stable version. Current: $current_branch, Latest: $latest_major_minor"
fi
- name: Deploy docs HTML
if: ${{ github.repository == 'adap/flower' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release') }}
if: ${{ github.repository == 'flwrlabs/flower' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'release') }}
env:
AWS_DEFAULT_REGION: ${{ secrets.DOCS_AWS_DEFAULT_REGION }}
AWS_ACCESS_KEY_ID: ${{ secrets.DOCS_AWS_ACCESS_KEY_ID }}
Expand All @@ -129,7 +129,7 @@ jobs:
aws s3 sync --exclude ".*" --cache-control "no-cache" ./framework/docs/build/html/${DOC_VERSION}/en/ s3://${{ secrets.DOCS_AWS_BUCKET_NAME }}/docs/framework/
fi
- name: Generate and deploy shared docs UI metadata from main
if: ${{ github.repository == 'adap/flower' && (github.ref == 'refs/heads/main' || github.event_name == 'release') }}
if: ${{ github.repository == 'flwrlabs/flower' && (github.ref == 'refs/heads/main' || github.event_name == 'release') }}
env:
AWS_DEFAULT_REGION: ${{ secrets.DOCS_AWS_DEFAULT_REGION }}
AWS_ACCESS_KEY_ID: ${{ secrets.DOCS_AWS_ACCESS_KEY_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/framework-draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:

jobs:
publish:
if: ${{ github.repository == 'adap/flower' }}
if: ${{ github.repository == 'flwrlabs/flower' }}
name: Publish draft
runs-on: ubuntu-22.04
steps:
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/framework-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Test wheel
run: ./framework/dev/test-wheel.sh
- name: Upload wheel
if: ${{ github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
if: ${{ github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
id: upload
env:
AWS_DEFAULT_REGION: ${{ secrets.ARTIFACT_AWS_DEFAULT_REGION }}
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
python-version: ${{ matrix.python-version }}
poetry-skip: 'true'
- name: Install Flower from repo
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
working-directory: ./framework
run: |
if [[ "${{ matrix.engine }}" == "simulation-engine" ]]; then
Expand All @@ -115,7 +115,7 @@ jobs:
python -m pip install .
fi
- name: Download and install Flower wheel from artifact store
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
run: |
# Define base URL for wheel file
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
if: ${{ needs.changes.outputs.framework == 'true' }}
run: python -m pip install --upgrade . --extra-index-url https://download.pytorch.org/whl/cpu
- name: Install Flower wheel from artifact store
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
run: |
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
Expand Down Expand Up @@ -289,7 +289,7 @@ jobs:
run: |
python -m pip install --upgrade .
- name: Install Flower wheel from artifact store
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
run: |
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
Expand Down Expand Up @@ -332,12 +332,12 @@ jobs:
if: ${{ needs.changes.outputs.framework == 'true' }}
uses: ./.github/actions/bootstrap
- name: Install Flower from repo
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
run: |
cd framework
python -m pip install .
- name: Install Flower wheel from artifact store
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
run: |
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
Expand Down Expand Up @@ -376,12 +376,12 @@ jobs:
if: ${{ needs.changes.outputs.framework == 'true' }}
uses: ./.github/actions/bootstrap
- name: Install Flower from repo
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
run: |
cd framework
python -m pip install .
- name: Install Flower wheel from artifact store
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
run: |
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
Expand Down Expand Up @@ -423,12 +423,12 @@ jobs:
python-version: ${{ matrix.python-version }}
poetry-skip: 'true'
- name: Install Flower from repo
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
run: |
cd framework
python -m pip install .
- name: Install Flower wheel from artifact store
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
run: |
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
python -m pip install "flwr[simulation] @ ${WHEEL_URL}"
Expand Down Expand Up @@ -471,7 +471,7 @@ jobs:
python-version: ${{ matrix.python-version }}
poetry-skip: 'true'
- name: Install Flower from repo
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'adap/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
if: ${{ needs.changes.outputs.framework == 'true' && (github.repository != 'flwrlabs/flower' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]') }}
working-directory: ./framework
run: |
if [[ "${{ matrix.engine }}" == "simulation-engine" ]]; then
Expand All @@ -480,7 +480,7 @@ jobs:
python -m pip install . "numpy>=${{ matrix.numpy-version }},<2.0"
fi
- name: Download and install Flower wheel from artifact store
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'adap/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
if: ${{ needs.changes.outputs.framework == 'true' && github.repository == 'flwrlabs/flower' && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
run: |
# Define base URL for wheel file
WHEEL_URL="https://${{ env.ARTIFACT_BUCKET }}/py/${{ needs.wheel.outputs.dir }}/${{ needs.wheel.outputs.short_sha }}/${{ needs.wheel.outputs.whl_path }}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/framework-release-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
release-nightly:
runs-on: ubuntu-22.04
name: Relase nightly on PyPI
if: github.repository == 'adap/flower'
if: github.repository == 'flwrlabs/flower'
outputs:
skip: ${{ steps.release.outputs.skip }}
pip-version: ${{ steps.release.outputs.pip-version }}
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:

build-docker-base-images:
name: Build nightly base images
if: github.repository == 'adap/flower' && needs.release-nightly.outputs.skip != 'true'
if: github.repository == 'flwrlabs/flower' && needs.release-nightly.outputs.skip != 'true'
uses: ./.github/workflows/_docker-build.yml
needs: release-nightly
strategy:
Expand All @@ -63,7 +63,7 @@ jobs:

build-docker-binary-images:
name: Build nightly binary images
if: github.repository == 'adap/flower' && needs.release-nightly.outputs.skip != 'true'
if: github.repository == 'flwrlabs/flower' && needs.release-nightly.outputs.skip != 'true'
uses: ./.github/workflows/_docker-build.yml
needs: [release-nightly, build-docker-base-images]
strategy:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/framework-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:

jobs:
publish:
if: ${{ github.repository == 'adap/flower' }}
if: ${{ github.repository == 'flwrlabs/flower' }}
name: Publish release
runs-on: ubuntu-22.04
outputs:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
python -m poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN_RELEASE_FLWR }}

parameters:
if: ${{ github.repository == 'adap/flower' }}
if: ${{ github.repository == 'flwrlabs/flower' }}
name: Collect docker build parameters
runs-on: ubuntu-22.04
timeout-minutes: 10
Expand All @@ -77,7 +77,7 @@ jobs:
echo "matrix=$(cat matrix.json)" >> $GITHUB_OUTPUT

build-base-images:
if: ${{ github.repository == 'adap/flower' }}
if: ${{ github.repository == 'flwrlabs/flower' }}
name: Build base images
uses: ./.github/workflows/_docker-build.yml
needs: parameters
Expand All @@ -97,7 +97,7 @@ jobs:
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

build-binary-images:
if: ${{ github.repository == 'adap/flower' }}
if: ${{ github.repository == 'flwrlabs/flower' }}
name: Build binary images
uses: ./.github/workflows/_docker-build.yml
needs: [parameters, build-base-images]
Expand Down
Loading
Loading