From 92f24f8d7f056ddd2da7201713469a058f7318fb Mon Sep 17 00:00:00 2001 From: "Zhang.H.N" Date: Wed, 27 Dec 2023 15:16:14 +0800 Subject: [PATCH] chore: update workflow and specific cmake version --- .github/workflows/pypi.yml | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 476b625..9fda7fd 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -105,10 +105,10 @@ jobs: - name: "Build and test for Windows" shell: powershell run: | - pip install --upgrade pip; - pip install build ; + python -m pip install --upgrade pip; + pip install build "setuptools>=42" "scikit-build>=0.13" "cmake>=3.18,<=3.25.2" "ninja" "versioneer[toml]"; conda install -c anaconda zlib ; - python -m build --wheel; + python -m build --wheel --no-isolation; Get-ChildItem -Path dist -Filter diamond4py*whl | ForEach-Object{ pip install "dist\$_" }; pushd test; python test.py; popd @@ -128,7 +128,7 @@ jobs: release: needs: ["manylinux-build", "win-build"] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/pyproject.toml b/pyproject.toml index c84f953..433013f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools>=42", "scikit-build>=0.13", - "cmake>=3.18", + "cmake>=3.18,<=3.25.2", "ninja", "versioneer[toml]" ]