From b983616f44bf404a2383cbdf1d1d636b2e3dd38c Mon Sep 17 00:00:00 2001 From: Adam Li Date: Tue, 9 Jul 2024 10:35:06 -0400 Subject: [PATCH 1/3] Fix circleCI Signed-off-by: Adam Li --- .circleci/config.yml | 2 +- treeple/_lib/sklearn_fork | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 910c2867e..535bd3ca8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,7 +55,7 @@ commands: echo ${CI_PULL_REQUEST//*pull\//} | tee merge.txt if [[ $(cat merge.txt) != "" ]]; then echo "Merging $(cat merge.txt)"; - git remote add upstream https://github.com/neurodata/scikit-tree.git; + git remote add upstream https://github.com/neurodata/treeple.git; git pull --ff-only upstream "refs/pull/$(cat merge.txt)/merge"; git fetch upstream main; fi diff --git a/treeple/_lib/sklearn_fork b/treeple/_lib/sklearn_fork index 74b2e699a..d455aa16e 160000 --- a/treeple/_lib/sklearn_fork +++ b/treeple/_lib/sklearn_fork @@ -1 +1 @@ -Subproject commit 74b2e699a2607b190ce6fc49b7625231023989c0 +Subproject commit d455aa16ee9cc42ce342dd07d9b94db117783fcc From 2c2ec0c12049906394721ff9edfdc7a7e05bd930 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:35:27 -0400 Subject: [PATCH 2/3] Bump pypa/cibuildwheel from 2.19.1 to 2.19.2 (#294) Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.19.1 to 2.19.2. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.19.1...v2.19.2) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Adam Li --- .github/workflows/build_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index cb5ed0889..4ad91cb5f 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -65,7 +65,7 @@ jobs: if: ${{ runner.os == 'Windows' && env.IS_32_BIT == 'false' }} - name: Build wheels - uses: pypa/cibuildwheel@v2.19.1 + uses: pypa/cibuildwheel@v2.19.2 # Build all wheels here, apart from macosx_arm64, linux_aarch64 # cibuildwheel is currently unable to pass configuration flags to # CIBW_BUILD_FRONTEND https://github.com/pypa/cibuildwheel/issues/1227 @@ -120,7 +120,7 @@ jobs: pip install .[build] - name: Build wheels - uses: pypa/cibuildwheel@v2.19.1 + uses: pypa/cibuildwheel@v2.19.2 env: CIBW_BUILD: ${{ matrix.python[0] }}-macosx_arm64 CIBW_ARCHS_MACOS: arm64 From 556317bc23801b1e7072c4705d5d0805ec1bc130 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:35:43 -0400 Subject: [PATCH 3/3] [pre-commit.ci] pre-commit autoupdate (#293) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.4.10 → v0.5.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.10...v0.5.1) - [github.com/astral-sh/ruff-pre-commit: v0.4.10 → v0.5.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.10...v0.5.1) - [github.com/pre-commit/mirrors-mypy: v1.10.0 → v1.10.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.10.0...v1.10.1) - [github.com/rstcheck/rstcheck.git: v6.2.0 → v6.2.4](https://github.com/rstcheck/rstcheck.git/compare/v6.2.0...v6.2.4) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Adam Li --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e6ca67983..faf27c35d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: # Ruff treeple - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.10 + rev: v0.5.1 hooks: - id: ruff name: ruff treeple @@ -31,7 +31,7 @@ repos: # Ruff tutorials and examples - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.10 + rev: v0.5.1 hooks: - id: ruff name: ruff tutorials and examples @@ -67,7 +67,7 @@ repos: # mypy - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.10.0 + rev: v1.10.1 hooks: - id: mypy # Avoid the conflict between mne/__init__.py and mne/__init__.pyi by ignoring the former @@ -76,7 +76,7 @@ repos: # rstcheck - repo: https://github.com/rstcheck/rstcheck.git - rev: v6.2.0 + rev: v6.2.4 hooks: - id: rstcheck additional_dependencies: