Skip to content

Commit

Permalink
chore: erase traces of substratools
Browse files Browse the repository at this point in the history
Signed-off-by: ThibaultFy <thibault.fouqueray@gmail.com>
  • Loading branch information
ThibaultFy committed Oct 3, 2024
1 parent ea0f33e commit 55edfb5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ body:
attributes:
label: Installed Substra versions
description: >
Which version of `substrafl`/ `substra` / `substra-tools` are you using?
Which version of `substrafl`/ `substra` are you using?
You can check if they are compatible in the [compatibility table](https://docs.substra.org/en/stable/additional/release.html#compatibility-table).
placeholder: >
pip freeze | grep substra
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,14 @@ Substra warmly welcomes any contribution. Feel free to fork the repo and create
## How to test

Install `substrafl` in editable mode with developper dependencies.
In addition, install `substra` and `substra-tools` in editable mode.
In addition, install `substra` in editable mode.
It is recommended to install all the libraries in a Python virtual env.

```sh
git clone git@github.com:Substra/substrafl.git
pip install -e "substrafl[dev]"
git clone git@github.com:Substra/substra.git
pip install -e substra
git clone git@github.com:Substra/substra-tools.git
pip install -e substra-tools
```

Now you can use the following command from `subtrafl` top level directory to run tests:
Expand Down
4 changes: 0 additions & 4 deletions docker/substrafl-tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,18 @@ WORKDIR /usr/src/app

### Dirty build to install docker client ###
# We need to install a docker client because substra debug mode relies on Docker (DinD in a side container)
# and we need a docker client to authenticate this docker against our container registry to download substra-tools.
RUN apt update && apt install --yes apt-transport-https ca-certificates curl gnupg lsb-release
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
RUN apt update && apt install --yes docker-ce-cli

COPY substra-tools/ substra-tools/
COPY substra/ substra/
COPY substrafl/ substrafl/

RUN cd substrafl && python -m pip install --no-cache-dir -e .[dev]

RUN cd substra && python -m pip install --no-cache-dir -e .

RUN cd substra-tools && python -m pip install --no-cache-dir -e .

RUN cd substrafl/benchmark/camelyon && python -m pip install -r requirements.txt

WORKDIR /usr/src/app/substrafl
4 changes: 2 additions & 2 deletions substrafl/remote/register/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@
# Create a Substra function from the wrapped user code
remote_instance = remote_struct.get_remote_instance()
# Register the functions to substra-tools
# Register the functions to substra.tools
remote_instance.register_substratools_function()
# Execute the function using substra-tools
# Execute the function using substra.tools
tools.execute()
"""

Expand Down
2 changes: 1 addition & 1 deletion substrafl/remote/substratools_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def generic_function(
outputs: TypedDict, # outputs contains a dict where keys are identifiers and values are paths on disk
task_properties: TypedDict,
) -> None:
"""Generic function to be registered and executed on the Substra platform using substra-tools.
"""Generic function to be registered and executed on the Substra platform using substra.tools.
Args:
inputs (TypedDict): dictionary containing the paths where to load the arguments for the method.
Expand Down

0 comments on commit 55edfb5

Please sign in to comment.