From 66e067d5538232d8db310999f7e08eafa3efb5f4 Mon Sep 17 00:00:00 2001 From: Jacob Callahan Date: Thu, 14 Mar 2024 14:23:11 -0400 Subject: [PATCH] Simplify uv use uv now let's us install to system python instead of requiring a virtual environment. --- .github/workflows/codeql-analysis.yml | 4 +--- .github/workflows/python-publish.yml | 4 +--- Dockerfile | 5 ++--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2f23d890..82c7ad45 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -50,9 +50,7 @@ jobs: BROKER_DIRECTORY: "${{ github.workspace }}/broker_dir" run: | pip install uv - uv venv - source .venv/bin/activate - uv pip install -e .[dev,docker] + uv pip install --system "broker[dev,docker] @ ." ls -l "$BROKER_DIRECTORY" broker --version pytest -v tests/ --ignore tests/functional diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 61b733a4..85ed3059 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -25,9 +25,7 @@ jobs: - name: Setup and Build run: | pip install uv - uv venv - source .venv/bin/activate - uv pip install -e .[setup] + uv pip install --system "broker[dev,docker] @ ." python -m build python -m twine check dist/* diff --git a/Dockerfile b/Dockerfile index 34c60bb8..16447b62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM fedora MAINTAINER https://github.com/SatelliteQE RUN dnf -y install make cmake gcc-c++ zlib-devel \ - openssl-devel git python3-pip python3-devel which\ + openssl-devel git python3 python3-pip python3-devel which\ && dnf clean all @@ -10,8 +10,7 @@ WORKDIR /root/broker COPY . /root/broker RUN pip install uv -RUN uv venv && source .venv/bin/activate -RUN uv pip install -e . +RUN uv pip install --system "broker @ ." ENTRYPOINT ["broker"] CMD ["--help"]