From 634751a3a8df752f54ee5cef06ff19b7b2da1fb8 Mon Sep 17 00:00:00 2001 From: Feda Curic Date: Tue, 19 Sep 2023 12:07:01 +0200 Subject: [PATCH 1/7] Unpin setuptools --- pyproject.toml | 4 ++-- script/build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 52d5353b0e9..7e48df58a74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,14 +1,14 @@ [build-system] requires = [ - "setuptools<64", + "setuptools", "setuptools_scm[toml]>=6.2", "wheel", "scikit-build", "cmake", "ninja", - "ecl", "conan<2", + "ecl", "pybind11>=2.10.0", # If this comes out of sync with the version installed by Conan please update the version in CMakeLists "grpcio-tools", ] diff --git a/script/build b/script/build index fdfd1a4b14b..8b51179a561 100755 --- a/script/build +++ b/script/build @@ -154,7 +154,7 @@ def install_build_requires() -> None: "install", "--upgrade", "pip", - "setuptools<64", + "setuptools", "wheel", "tomli", *extra_req, From 5fc0545819f63ccf4d837403ab3f538447eb6d1d Mon Sep 17 00:00:00 2001 From: Feda Curic Date: Tue, 19 Sep 2023 14:39:47 +0200 Subject: [PATCH 2/7] Install without -e --- .github/workflows/doctest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 1bb29c70392..13bbcc26022 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -31,7 +31,7 @@ jobs: setup.py pyproject.toml dev-requirements.txt - - run: pip install -e . + - run: pip install . - name: Install with dependencies run: | From f6b3cb189f20939204c2f3ae1e31d496741e2fcb Mon Sep 17 00:00:00 2001 From: Feda Curic Date: Tue, 19 Sep 2023 14:46:00 +0200 Subject: [PATCH 3/7] Run in venv --- .github/workflows/doctest.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 13bbcc26022..57771a37a21 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -21,6 +21,7 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 + - name: Set up Python uses: actions/setup-python@v4 id: setup_python @@ -31,6 +32,12 @@ jobs: setup.py pyproject.toml dev-requirements.txt + + - name: Create and activate virtual environment + run: | + python -m venv venv + echo "venv/bin" >> $GITHUB_PATH + - run: pip install . - name: Install with dependencies From d0b2845e2ea7e668fcd2ca7eaefa77c66b76f7bb Mon Sep 17 00:00:00 2001 From: Feda Curic Date: Tue, 19 Sep 2023 14:46:44 +0200 Subject: [PATCH 4/7] Commitin --- .github/workflows/doctest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 57771a37a21..bd751c87c9d 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -38,7 +38,7 @@ jobs: python -m venv venv echo "venv/bin" >> $GITHUB_PATH - - run: pip install . + - run: pip install -e . - name: Install with dependencies run: | From ee6c6076d19cca37adc3564889249f79c466a50d Mon Sep 17 00:00:00 2001 From: Feda Curic Date: Tue, 19 Sep 2023 14:50:31 +0200 Subject: [PATCH 5/7] Commitin --- .github/workflows/doctest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index bd751c87c9d..e9a3a4fc305 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -36,7 +36,7 @@ jobs: - name: Create and activate virtual environment run: | python -m venv venv - echo "venv/bin" >> $GITHUB_PATH + echo 'venv/bin' >> $GITHUB_PATH - run: pip install -e . From c130e22dece5e7d42a49212a5df16d598ab29894 Mon Sep 17 00:00:00 2001 From: Feda Curic Date: Tue, 19 Sep 2023 14:54:50 +0200 Subject: [PATCH 6/7] Commitin --- .github/workflows/doctest.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index e9a3a4fc305..a505f43d9d2 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -36,7 +36,8 @@ jobs: - name: Create and activate virtual environment run: | python -m venv venv - echo 'venv/bin' >> $GITHUB_PATH + . .venv/bin/activate + echo PATH=$PATH >> $GITHUB_ENV - run: pip install -e . From c1d625b2b72c2a5f566d3a55d3c774f3ff0fb048 Mon Sep 17 00:00:00 2001 From: Feda Curic Date: Tue, 19 Sep 2023 14:56:11 +0200 Subject: [PATCH 7/7] Commitin --- .github/workflows/doctest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index a505f43d9d2..6fd74381ff4 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -35,7 +35,7 @@ jobs: - name: Create and activate virtual environment run: | - python -m venv venv + python -m venv .venv . .venv/bin/activate echo PATH=$PATH >> $GITHUB_ENV