From a7e967aae9179d8cc20d96304a9017d79c8801a5 Mon Sep 17 00:00:00 2001 From: Mathieu Fehr Date: Mon, 13 Jan 2025 16:52:19 +0000 Subject: [PATCH 1/4] CI: Create missing virtual enviroment in the publish job --- .github/workflows/pythonpublish.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index ab2e2f5b6b..c7bcae577a 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -16,6 +16,12 @@ jobs: - name: Set up Python run: uv python install 3.11 + - name: Create the virtual environment + run: | + # Change directory so that xdsl-opt can be found during installation. + cd xdsl + VENV_EXTRAS="--all-extras" make venv + - name: Install dependencies run: | uv pip install setuptools wheel From c6e14014c7018e9cf1ad95026f68960825cebb3e Mon Sep 17 00:00:00 2001 From: Fehr Mathieu Date: Mon, 13 Jan 2025 17:04:04 +0000 Subject: [PATCH 2/4] Update .github/workflows/pythonpublish.yml Co-authored-by: Sasha Lopoukhine --- .github/workflows/pythonpublish.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index c7bcae577a..2046910069 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -16,12 +16,10 @@ jobs: - name: Set up Python run: uv python install 3.11 - - name: Create the virtual environment + - name: Build and publish run: | - # Change directory so that xdsl-opt can be found during installation. - cd xdsl - VENV_EXTRAS="--all-extras" make venv - + uvx --with setuptools --with wheel setup.py sdist bdist_wheel + uvx twine upload -u __token__ -p ${{ secrets.PYPI_XDSL_TOKEN }} dist/* - name: Install dependencies run: | uv pip install setuptools wheel From 872e0a29cfa963e0f0ed6a13512cd252e3269b88 Mon Sep 17 00:00:00 2001 From: Mathieu Fehr Date: Mon, 13 Jan 2025 17:05:02 +0000 Subject: [PATCH 3/4] Fix change --- .github/workflows/pythonpublish.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index 2046910069..10b5549acf 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -16,15 +16,11 @@ jobs: - name: Set up Python run: uv python install 3.11 - - name: Build and publish - run: | - uvx --with setuptools --with wheel setup.py sdist bdist_wheel - uvx twine upload -u __token__ -p ${{ secrets.PYPI_XDSL_TOKEN }} dist/* - name: Install dependencies run: | uv pip install setuptools wheel - name: Build and publish run: | - uv run setup.py sdist bdist_wheel - uv tool run twine upload -u __token__ -p ${{ secrets.PYPI_XDSL_TOKEN }} dist/* + uvx --with setuptools --with wheel setup.py sdist bdist_wheel + uvx twine upload -u __token__ -p ${{ secrets.PYPI_XDSL_TOKEN }} dist/* From 4dc176fd766e59b1ff2410b78662a9defd202588 Mon Sep 17 00:00:00 2001 From: Mathieu Fehr Date: Mon, 13 Jan 2025 17:10:48 +0000 Subject: [PATCH 4/4] Remove dependencies installation --- .github/workflows/pythonpublish.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index 10b5549acf..f61aa3fba5 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -16,10 +16,6 @@ jobs: - name: Set up Python run: uv python install 3.11 - - name: Install dependencies - run: | - uv pip install setuptools wheel - - name: Build and publish run: | uvx --with setuptools --with wheel setup.py sdist bdist_wheel