From 00e4eddb8b92663c18506f55ad7918504794fcff Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Tue, 14 May 2024 13:12:38 +0200 Subject: [PATCH 1/4] Dockerfile: No need to activate virtualenv Invoking the 'pip' that is already installed in the virtualenv has the same effect. --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f0b866..6a6a703 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,8 @@ ARG VERSION=v0.15.0 ENV VIRTUAL_ENV=/opt/venv RUN python -m venv $VIRTUAL_ENV -RUN . $VIRTUAL_ENV/bin/activate -RUN . /opt/venv/bin/activate \ - && pip install --no-cache-dir --upgrade pip setuptools \ - && pip install --no-cache-dir fawltydeps==$VERSION +RUN $VIRTUAL_ENV/bin/pip install --no-cache-dir --upgrade pip setuptools \ + && $VIRTUAL_ENV/bin/pip install --no-cache-dir fawltydeps==$VERSION ENV PATH="${VIRTUAL_ENV}/bin:$PATH" From 317abf51fcb93c2c8be96f1eb51b6c12690da48e Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Tue, 14 May 2024 13:13:47 +0200 Subject: [PATCH 2/4] Dockerfile: Use $VIRTUAL_ENV instead of duplicating its value --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a6a703..d030ab8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ RUN $VIRTUAL_ENV/bin/pip install --no-cache-dir --upgrade pip setuptools \ ENV PATH="${VIRTUAL_ENV}/bin:$PATH" -CMD ["/opt/venv/bin/fawltydeps"] +CMD ["${VIRTUAL_ENV}/bin/fawltydeps"] From 4c83b23074740542c9016ef16cbc8de060bdc53d Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Tue, 14 May 2024 13:15:41 +0200 Subject: [PATCH 3/4] README.md: Minor tweaks Insert a paragraph break before "Simple usage:". Also, use "customized" instead of "extra" to describe the command line options being passed in the advanced example. (With "extra" it reads like the options are being appended to a list of existing - or default - command line options, but in fact there are _no_ command line options passed by default). --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31e92f4..b2896af 100644 --- a/README.md +++ b/README.md @@ -42,14 +42,15 @@ This action will run `fawltydeps` in the project directory for a Python codebase ## Example usage -You need to use a `checkout` action before +You need to use a `checkout` action before the FawltyDeps action. + Simple usage: steps: - uses: actions/checkout@v4 - uses: tweag/FawltyDeps-action@v0.0.2 -More advanced example with extra command line options: +More advanced example with customized command line options: steps: - name: checkout From c2e05c0896cbbd4ceaf67dd80810704f54150a16 Mon Sep 17 00:00:00 2001 From: Richard Bullington-McGuire Date: Thu, 23 May 2024 16:48:19 -0400 Subject: [PATCH 4/4] Bump version for release --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2896af..8205e92 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Simple usage: steps: - uses: actions/checkout@v4 - - uses: tweag/FawltyDeps-action@v0.0.2 + - uses: tweag/FawltyDeps-action@v0.0.3 More advanced example with customized command line options: @@ -56,7 +56,7 @@ More advanced example with customized command line options: - name: checkout uses: actions/checkout@v4 - name: fawltydeps lint - uses: tweag/FawltyDeps-action@v0.0.2 + uses: tweag/FawltyDeps-action@v0.0.3 with: options: --list-sources --list-imports --list-deps --detailed