From 55edfb5d6d62754b5c47d150d543ec531ca4afee Mon Sep 17 00:00:00 2001 From: ThibaultFy Date: Thu, 3 Oct 2024 16:17:46 +0200 Subject: [PATCH] chore: erase traces of substratools Signed-off-by: ThibaultFy --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- README.md | 4 +--- docker/substrafl-tests/Dockerfile | 4 ---- substrafl/remote/register/register.py | 4 ++-- substrafl/remote/substratools_methods.py | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 477493ee..4f1f60d5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -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 diff --git a/README.md b/README.md index 4991ec45..18f04b4e 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ 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 @@ -54,8 +54,6 @@ 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: diff --git a/docker/substrafl-tests/Dockerfile b/docker/substrafl-tests/Dockerfile index 959ad1d7..a183a2ae 100644 --- a/docker/substrafl-tests/Dockerfile +++ b/docker/substrafl-tests/Dockerfile @@ -4,13 +4,11 @@ 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/ @@ -18,8 +16,6 @@ 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 diff --git a/substrafl/remote/register/register.py b/substrafl/remote/register/register.py index cc48df37..bf259e7e 100644 --- a/substrafl/remote/register/register.py +++ b/substrafl/remote/register/register.py @@ -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() """ diff --git a/substrafl/remote/substratools_methods.py b/substrafl/remote/substratools_methods.py index f56eb267..0075740a 100644 --- a/substrafl/remote/substratools_methods.py +++ b/substrafl/remote/substratools_methods.py @@ -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.