From eaa5e82becf184e9937b29ad1f81a44aac8e364c Mon Sep 17 00:00:00 2001 From: acostapazo Date: Wed, 11 Sep 2024 11:51:27 +0200 Subject: [PATCH 1/2] chore: use uv to manage installation --- .github/workflows/ci.yml | 6 ++++-- .github/workflows/coverage.yml | 3 ++- .github/workflows/docs.yml | 3 ++- lume.yml | 13 ++++++------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1118545..0a010cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,9 +22,10 @@ jobs: python-version: ${{ matrix.python-version }} cache: pip cache-dependency-path: pyproject.toml + - uses: astral-sh/setup-uv@v2 - name: Install dependencies run: | - pip install lume + uv pip install lume lume -install - name: Lint run: lume -lint @@ -45,7 +46,8 @@ jobs: - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + - uses: astral-sh/setup-uv@v2 - name: Install latest version of meiga from code (without other dependencies as lume) - run: pip install -e . + run: uv pip install -e . - name: Check imports run: python -c "from meiga import Error, Success, Failure, Result, early_return, async_early_return" diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 04d27c8..b3d1052 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -18,9 +18,10 @@ jobs: python-version: '3.11' cache: pip cache-dependency-path: pyproject.toml + - uses: astral-sh/setup-uv@v2 - name: Install dependencies run: | - pip install lume + uv pip install lume lume -install - name: Coverage run: lume -coverage diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 40bf597..fd89201 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,9 +17,10 @@ jobs: python-version: '3.11' cache: pip cache-dependency-path: pyproject.toml + - uses: astral-sh/setup-uv@v2 - name: Create Documentation run: | - pip install lume + uv pip install lume lume -docs - name: Publish run: mkdocs gh-deploy --force diff --git a/lume.yml b/lume.yml index 6d2c03e..84de80c 100644 --- a/lume.yml +++ b/lume.yml @@ -1,19 +1,18 @@ -name: document-security-experiments +name: meiga envs: PACKAGE_NAME: meiga install: run: - #- pip install -U -r requirements/requirements.txt -r requirements/dev-requirements.txt - - pip install -e .[dev] + - uv pip install -e .[dev] - pre-commit install uninstall: run: - - pip uninstall meiga -y - - pip freeze | xargs pip uninstall -y - - pip install lume + - uv uninstall meiga -y + - uv pip freeze | xargs uv pip uninstall + - uv install lume steps: reinstall: @@ -41,7 +40,7 @@ steps: run: pytest -v docs: run: | - pip install -e .[doc] + uv pip install -e .[doc] mkdocs build check-no-binary-installation: run: | From c60d42778a90d96fe2d8d3a05ac05a77d8d63e87 Mon Sep 17 00:00:00 2001 From: acostapazo Date: Wed, 11 Sep 2024 12:02:34 +0200 Subject: [PATCH 2/2] fix: setup env --- .github/workflows/ci.yml | 12 ++++++++++++ .github/workflows/coverage.yml | 6 ++++++ .github/workflows/docs.yml | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a010cb..085ac46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,12 @@ jobs: cache: pip cache-dependency-path: pyproject.toml - uses: astral-sh/setup-uv@v2 + - name: Setup venv + run: | + uv venv .venv + echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV + echo "$PWD/.venv/bin" >> $GITHUB_PATH + mkdir -p $(pip cache dir) - name: Install dependencies run: | uv pip install lume @@ -47,6 +53,12 @@ jobs: with: python-version: ${{ matrix.python-version }} - uses: astral-sh/setup-uv@v2 + - name: Setup venv + run: | + uv venv .venv + echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV + echo "$PWD/.venv/bin" >> $GITHUB_PATH + mkdir -p $(pip cache dir) - name: Install latest version of meiga from code (without other dependencies as lume) run: uv pip install -e . - name: Check imports diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index b3d1052..8024267 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -19,6 +19,12 @@ jobs: cache: pip cache-dependency-path: pyproject.toml - uses: astral-sh/setup-uv@v2 + - name: Setup venv + run: | + uv venv .venv + echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV + echo "$PWD/.venv/bin" >> $GITHUB_PATH + mkdir -p $(pip cache dir) - name: Install dependencies run: | uv pip install lume diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fd89201..6102aff 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -18,6 +18,12 @@ jobs: cache: pip cache-dependency-path: pyproject.toml - uses: astral-sh/setup-uv@v2 + - name: Setup venv + run: | + uv venv .venv + echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV + echo "$PWD/.venv/bin" >> $GITHUB_PATH + mkdir -p $(pip cache dir) - name: Create Documentation run: | uv pip install lume