Skip to content

Commit

Permalink
Removed uv, as it does not work with pytest out of the box.
Browse files Browse the repository at this point in the history
Would be faster but at the moment not worth optimisiing

Revert "made shure that uv creates a venv first"

This reverts commit a6552d0

Revert "tested if the uv needed to be activated"

This reverts commit 22bded1.

Revert "tested if dancing with venv activation/deactivation fixes the path resolution"

This reverts commit 7a89179.

Reapply "tested if dancing with venv activation/deactivation fixes the path resolution"

This reverts commit 24142ee.

Revert "tested if manually installed pytest in CI fixes pytest not being found"

This reverts commit fc4924a.

Revert "tested if venv trickery fixes the CI-dependency troubles"

This reverts commit 079bc3a.
  • Loading branch information
CommanderStorm committed Apr 28, 2024
1 parent 079bc3a commit 3fe9200
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 24 deletions.
16 changes: 2 additions & 14 deletions .github/workflows/data-cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/update-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down

0 comments on commit 3fe9200

Please sign in to comment.