From 3fe92004c79456262b785a3252e41579b14fc774 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Sun, 28 Apr 2024 17:38:33 +0200 Subject: [PATCH] Removed `uv`, as it does not work with `pytest` out of the box. Would be faster but at the moment not worth optimisiing Revert "made shure that uv creates a venv first" This reverts commit a6552d01 Revert "tested if the uv needed to be activated" This reverts commit 22bded148297f076e0e7210246b28988652497ef. Revert "tested if dancing with venv activation/deactivation fixes the path resolution" This reverts commit 7a89179aa25ea2097e4b439771c8e3ef3a4b153a. Reapply "tested if dancing with venv activation/deactivation fixes the path resolution" This reverts commit 24142eeab61b8e805b73c4a122a1b624afdbab50. Revert "tested if manually installed pytest in CI fixes pytest not being found" This reverts commit fc4924af22e2dc7d8013bca21c8550a4b1c10b12. Revert "tested if venv trickery fixes the CI-dependency troubles" This reverts commit 079bc3a4522b587bc9eeb3c9f85da6ba86797cf6. --- .github/workflows/data-cicd.yml | 16 ++-------------- .github/workflows/linting.yml | 6 +----- .github/workflows/update-data.yml | 6 +----- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/data-cicd.yml b/.github/workflows/data-cicd.yml index 446341cda..70c421470 100644 --- a/.github/workflows/data-cicd.yml +++ b/.github/workflows/data-cicd.yml @@ -20,16 +20,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: setup uv - run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Install dependencies - run: | - uv venv - source .venv/bin/activate - uv pip install -r data/requirements.txt -r requirements-dev.txt - deactivate - source .venv/bin/activate - pip install pytest + run: pip install -r data/requirements.txt -r requirements-dev.txt - run: pytest data #type-check: # runs-on: ubuntu-latest @@ -39,12 +31,8 @@ jobs: # uses: actions/setup-python@v5 # with: # python-version: ${{ matrix.python-version }} - # - name: setup uv - # run: curl -LsSf https://astral.sh/uv/install.sh | sh # - name: Install dependencies - # run: | - # uv venv - # uv pip install -r data/requirements.txt -r requirements-dev.txt + # run: pip install -r data/requirements.txt -r requirements-dev.txt # - name: Run mypy # run: mypy --strict data data-build: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 061b8daba..63106c27b 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -25,12 +25,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.12' - - name: setup uv - run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Install python dependencies - run: | - uv venv - uv pip install -r data/requirements.txt -r requirements-dev.txt + run: pip install -r data/requirements.txt -r requirements-dev.txt - name: Run pre-commit continue-on-error: ${{ github.ref == 'refs/heads/main' }} uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/update-data.yml b/.github/workflows/update-data.yml index 77c5d1c44..3c7f48b1c 100644 --- a/.github/workflows/update-data.yml +++ b/.github/workflows/update-data.yml @@ -22,12 +22,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.12' - - name: setup uv - run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Install python dependencies - run: | - uv venv - uv pip install -r data/requirements.txt -r requirements-dev.txt + run: pip install -r data/requirements.txt -r requirements-dev.txt - name: Download data continue-on-error: true # a PR deleting all data will be created if this fails => fail obvious run: |