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 e7109d0 commit 5159854
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 65 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ jobs:
path: substra
ref: ${{ env.SUBSTRA_REF }}

- name: checkout substra tools
uses: actions/checkout@v4
with:
repository: Substra/substra-tools
path: substra-tools
ref: ${{ env.TOOLS_REF }}

- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
Expand All @@ -59,7 +52,6 @@ jobs:

- name: Install requirements
run: |
pip install --no-cache-dir ./substra-tools
pip install --no-cache-dir ./substra
pip install --no-cache-dir -r requirements.txt
pip install -r requirements-workflows.txt
Expand Down
53 changes: 0 additions & 53 deletions ci/cloudbuild/substra_tools.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions docker/substra-tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ 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
Expand All @@ -13,8 +12,6 @@ RUN apt update && apt install --yes docker-ce-cli

COPY substra ./substra
RUN pip install ./substra
COPY substra-tools ./substra-tools
RUN pip install ./substra-tools

COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion tests/test_docker_image_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def get_dockerfile(base_image: str, function_category: FunctionCategory, extra_i
RUN apt-get update -y && apt-get install -y git
RUN python3 -m pip install -U pip
RUN python3 -m pip install git+https://github.com/Substra/substra-tools.git@{substra_git_ref}
RUN python3 -m pip install git+https://github.com/Substra/substra.git@{substra_git_ref}
COPY function.py .
{extra_instructions}
Expand Down

0 comments on commit 5159854

Please sign in to comment.