Skip to content

Commit

Permalink
Merge pull request #85 from KarhouTam/dev
Browse files Browse the repository at this point in the history
refactor(renaming): Rename .environement to .env
Erase some comments
  • Loading branch information
KarhouTam authored Aug 30, 2024
2 parents d698e15 + e62d620 commit de1f863
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .environment/Dockerfile → .env/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt update && \

WORKDIR /root

COPY .environment/requirements.txt /tmp
COPY .env/requirements.txt /tmp

RUN pip install --upgrade pip && \
pip install -r /tmp/requirements.txt
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docker Image Publish
on:
push:
paths:
- ".environment/**"
- ".env/**"
- ".github/workflows/docker-publish.yml"

env:
Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: .environment/Dockerfile
file: .env/Dockerfile
push: false
tags: |
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_LOWERCASE_OWNER }}/${{ env.IMAGE_LOWERCASE_NAME }}:${{ env.IMAGE_TAG }}
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: .environment/Dockerfile
file: .env/Dockerfile
push: true
tags: |
${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_LOWERCASE_OWNER }}/${{ env.IMAGE_LOWERCASE_NAME }}:${{ env.IMAGE_TAG }}
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: .environment/Dockerfile
file: .env/Dockerfile
push: true
tags: |
${{ env.ALIYUN_REGISTRY }}/${{ env.IMAGE_LOWERCASE_OWNER }}/${{ env.IMAGE_LOWERCASE_NAME }}:${{ env.IMAGE_TAG }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,17 @@ FL-bench welcomes PR on everything that can make this project better.

### PyPI 🐍
```sh
pip install -r .environment/requirements.txt
pip install -r .env/requirements.txt
```

### Poetry 🎶
For those China mainland users
```sh
poetry install --no-root -C .environment
poetry install --no-root -C .env
```
For others
```sh
cd .environment && sed -i "10,14d" pyproject.toml && poetry lock --no-update && poetry install --no-root
cd .env && sed -i "10,14d" pyproject.toml && poetry lock --no-update && poetry install --no-root
```

### Docker 🐳
Expand Down
2 changes: 0 additions & 2 deletions config/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,10 @@ common:

# You can set specific arguments for FL methods also
# FL-bench uses FL method arguments by args.<method>.<arg>
# e.g.
fedprox:
mu: 0.01
pfedsim:
warmup_round: 0.7
# ...

# NOTE: For those unmentioned arguments, the default values are set in `get_hyperparams()` in `class <method>Server` in `src/server/<method>.py`

0 comments on commit de1f863

Please sign in to comment.