From 1fc670ab6972ec8e61493a2444e028c5a7ba7d9c Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 12 Mar 2024 09:22:19 -0500 Subject: [PATCH 1/7] Set up development environment with uv pip --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fb57d15..bbedc51 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ .PHONY: requirements requirements: - python3 -m pip install -r requirements/development.txt + python3 -m pip install uv + uv pip install -r requirements/development.txt .PHONY: check check: From a8bb467cf0800afcb37694da6e6ad9d82f35d142 Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 12 Mar 2024 09:28:16 -0500 Subject: [PATCH 2/7] Use --system for GHA --- .github/workflows/build.yml | 2 +- Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a433eb..6a6de6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - run: make requirements + - run: make ci_requirements - name: Set up QEMU # Needed to build aarch64 wheels if: runner.os == 'Linux' uses: docker/setup-qemu-action@v2 diff --git a/Makefile b/Makefile index bbedc51..9015f0e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,12 @@ +.PHONY: requirements +ci_requirements: + python3 -m pip install uv + python3 -m uv pip install --system -r requirements/development.txt + .PHONY: requirements requirements: python3 -m pip install uv - uv pip install -r requirements/development.txt + python3 -m pip install -r requirements/development.txt .PHONY: check check: From 73902b394c2c4d827595700ec52b5a7d0a32d05a Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 12 Mar 2024 09:41:55 -0500 Subject: [PATCH 3/7] Update Makefile Co-authored-by: Yagiz Nizipli --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9015f0e..dc46ca4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: requirements +.PHONY: ci_requirements ci_requirements: python3 -m pip install uv python3 -m uv pip install --system -r requirements/development.txt From be4f0b7093859fcc7d68991bedc1f5a8e4675140 Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 12 Mar 2024 09:45:45 -0500 Subject: [PATCH 4/7] Try --break-system-packages --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dc46ca4..2c38942 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: ci_requirements ci_requirements: python3 -m pip install uv - python3 -m uv pip install --system -r requirements/development.txt + python3 -m uv pip install --break-system-packages -r requirements/development.txt .PHONY: requirements requirements: From 3bedb898f595a0a0a35707149da037fb96728dc6 Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 12 Mar 2024 09:55:08 -0500 Subject: [PATCH 5/7] Try --no-isolation --- .github/workflows/build.yml | 2 +- Makefile | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a6de6a..230112a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - make requirements + make ci_requirements python -m build --no-isolation --sdist - uses: actions/upload-artifact@v3 with: diff --git a/Makefile b/Makefile index 2c38942..63710b2 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,7 @@ -.PHONY: ci_requirements -ci_requirements: - python3 -m pip install uv - python3 -m uv pip install --break-system-packages -r requirements/development.txt - .PHONY: requirements requirements: python3 -m pip install uv - python3 -m pip install -r requirements/development.txt + python3 -m uv pip install --no-isolation -r requirements/development.txt .PHONY: check check: From 46525fb42d7bc696f21e5855d633639f0b597e35 Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 12 Mar 2024 09:56:45 -0500 Subject: [PATCH 6/7] Try that again --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 63710b2..4a6038e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,12 @@ +.PHONY: ci_requirements +ci_requirements: + python3 -m pip install uv + pip install --no-isolation -r requirements/development.txt + .PHONY: requirements requirements: python3 -m pip install uv - python3 -m uv pip install --no-isolation -r requirements/development.txt + python3 -m uv pip install -r requirements/development.txt .PHONY: check check: From 1a7d4f67d7f862e8c59ce5b43321dffa773db76f Mon Sep 17 00:00:00 2001 From: Bo Bayles Date: Tue, 12 Mar 2024 09:57:42 -0500 Subject: [PATCH 7/7] The uv flag is --no-build-isolation --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4a6038e..0b961d0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: ci_requirements ci_requirements: python3 -m pip install uv - pip install --no-isolation -r requirements/development.txt + pip install --no-build-isolation -r requirements/development.txt .PHONY: requirements requirements: