From cdafdfc1dbd9cdf97d2976ed46e920a953d5103a Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Sat, 3 May 2025 18:27:13 -0700 Subject: [PATCH 1/2] Pin setuptools to <80 Builds currently fail, pin in the mean time --- .github/workflows/generate-coverage.yaml | 2 +- .github/workflows/os-llvm-sycl-build.yml | 2 +- conda-recipe/meta.yaml | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-coverage.yaml b/.github/workflows/generate-coverage.yaml index e4fa16c591..bfbefb61d2 100644 --- a/.github/workflows/generate-coverage.yaml +++ b/.github/workflows/generate-coverage.yaml @@ -91,7 +91,7 @@ jobs: - name: Install dpctl dependencies shell: bash -l {0} run: | - pip install numpy cython setuptools"<80" pytest pytest-cov scikit-build cmake coverage[toml] versioneer[toml]==0.29 + pip install numpy cython setuptools pytest pytest-cov scikit-build cmake coverage[toml] versioneer[toml]==0.29 - name: Build dpctl with coverage shell: bash -l {0} diff --git a/.github/workflows/os-llvm-sycl-build.yml b/.github/workflows/os-llvm-sycl-build.yml index c67fabea63..9df9fc20de 100644 --- a/.github/workflows/os-llvm-sycl-build.yml +++ b/.github/workflows/os-llvm-sycl-build.yml @@ -107,7 +107,7 @@ jobs: - name: Install dpctl dependencies shell: bash -l {0} run: | - pip install numpy cython setuptools"<80" pytest scikit-build cmake ninja versioneer[toml]==0.29 + pip install numpy cython setuptools pytest scikit-build cmake ninja versioneer[toml]==0.29 - name: Checkout repo uses: actions/checkout@v4.2.2 diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index a6e06f0dfd..08ffc6a49f 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -33,7 +33,7 @@ requirements: - {{ pin_compatible('intel-cmplr-lib-rt', min_pin='x.x', max_pin='x') }} # Ensure we are using latest version of setuptools, since we don't need # editable environments for release. - - setuptools >=69 + - setuptools >=69,<80 {% for dep in py_build_deps %} {% if dep.startswith('ninja') %} - {{ dep.split(';')[0] }} # [not win] diff --git a/pyproject.toml b/pyproject.toml index 516b34549e..9612ce5ec9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = [ # TODO: keep in sync with [project.dependencies] "wheel>=0.43", "build>=1.1", - "setuptools>=63.0.0", + "setuptools>=63.0.0,<80", "scikit-build>=0.17.0", "ninja>=1.11.1; platform_system!='Windows'", "cmake>=3.29.0", From aac945b96d90f5572331ecf4eb5ca1d35ff2403f Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Sat, 3 May 2025 18:59:28 -0700 Subject: [PATCH 2/2] Update bandit version in pre-commit-config --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a313d8062c..e85881dd4e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/PyCQA/bandit - rev: '1.7.9' + rev: '1.8.3' hooks: - id: bandit pass_filenames: false