From 684f801d598a12ca56df93427a62094aef17c452 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Apr 2022 00:41:44 -0400
Subject: [PATCH] chore(deps): bump pypa/cibuildwheel from 2.3.1 to 2.4.0 (#27)
* chore(deps): bump pypa/cibuildwheel from 2.3.1 to 2.4.0
Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.3.1 to 2.4.0.
- [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.3.1...v2.4.0)
---
updated-dependencies:
- dependency-name: pypa/cibuildwheel
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* fix: bumping versions
* fix: minor touchups
* ci: bump to non-removed jobs
* ci: drop Windows conda for now
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com>
---
.github/workflows/conda.yml | 4 ++--
.github/workflows/pip.yml | 11 +++--------
.github/workflows/wheels.yml | 2 +-
.gitignore | 2 ++
.pre-commit-config.yaml | 10 +++++-----
CMakeLists.txt | 2 +-
pyproject.toml | 5 ++---
7 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 0a4d590..5131804 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -12,8 +12,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- platform: [ubuntu-latest, windows-2016, macos-latest]
- python-version: ["3.6", "3.8"]
+ platform: [ubuntu-latest, macos-latest] # TODO: windows after 2016 doesn't config correctly
+ python-version: ["3.7", "3.9"]
runs-on: ${{ matrix.platform }}
diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
index e6e0977..aa74cf3 100644
--- a/.github/workflows/pip.yml
+++ b/.github/workflows/pip.yml
@@ -15,20 +15,15 @@ jobs:
fail-fast: false
matrix:
platform: [windows-latest, macos-latest, ubuntu-latest]
- python-version: ["3.6", "3.10", "pypy-3.7"]
+ python-version: ["3.6", "3.10", "pypy-3.8"]
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- - name: Set min macOS version
- if: matrix.python-version == 'pypy-3.7' && runner.os == 'macOS'
- run: |
- echo "MACOS_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV
-
- name: Build and install
run: pip install --verbose .[test]
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index f5c0a29..81382eb 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -48,7 +48,7 @@ jobs:
with:
submodules: true
- - uses: pypa/cibuildwheel@v2.3.1
+ - uses: pypa/cibuildwheel@v2.4.0
- name: Verify clean directory
run: git diff --exit-code
diff --git a/.gitignore b/.gitignore
index 78d45bd..6d1889e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,5 @@ dmypy.json
# Cython debug symbols
cython_debug/
+
+_skbuild/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 07f0f85..ccadf92 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ ci:
repos:
# Standard hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.0.1
+ rev: v4.1.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
@@ -35,27 +35,27 @@ repos:
# Black, the code formatter, natively supports pre-commit
- repo: https://github.com/psf/black
- rev: 21.9b0
+ rev: 22.3.0
hooks:
- id: black
exclude: ^(docs)
# Sort your imports in a standard form
- repo: https://github.com/PyCQA/isort
- rev: 5.9.3
+ rev: 5.10.1
hooks:
- id: isort
# Upgrade older Python syntax
- repo: https://github.com/asottile/pyupgrade
- rev: v2.29.0
+ rev: v2.31.1
hooks:
- id: pyupgrade
args: ["--py36-plus"]
# Changes tabs to spaces
- repo: https://github.com/Lucas-C/pre-commit-hooks
- rev: v1.1.10
+ rev: v1.1.13
hooks:
- id: remove-tabs
exclude: ^(docs)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8d4ee0..17efbaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15...3.19)
+cmake_minimum_required(VERSION 3.15...3.22)
project(scikit_build_example VERSION "0.0.1")
diff --git a/pyproject.toml b/pyproject.toml
index ec64ba2..9927324 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,9 @@
[build-system]
requires = [
"setuptools>=42",
- "wheel",
- "pybind11>=2.9.0",
+ "pybind11>=2.9.2",
"cmake>=3.22",
- "scikit-build>=0.13",
+ "scikit-build>=0.14",
]
build-backend = "setuptools.build_meta"
--
GitLab