Skip to content

Commit 9844fd9

Browse files
authored
chore: bump versions to 0.13 (#20)
1 parent d3e9fe7 commit 9844fd9

File tree

18 files changed

+31
-73
lines changed

18 files changed

+31
-73
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
name: CI
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
push:
67
branches:
78
- master
89

10+
env:
11+
FORCE_COLOR: 3
12+
913
jobs:
1014
checks:
1115
runs-on: ${{ matrix.runs-on }}
@@ -19,5 +23,4 @@ jobs:
1923
steps:
2024
- uses: actions/checkout@v2
2125
- uses: excitedleigh/[email protected]
22-
23-
- run: nox --force-color
26+
- run: nox

noxfile.py

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,24 @@
11
import nox
2-
from pathlib import Path
3-
import shutil
42

53
hello_list = "hello-pure", "hello-cpp", "hello-pybind11", "hello-cython"
4+
long_hello_list = hello_list + ("pen2-cython",)
65

76

87
@nox.session
9-
@nox.parametrize("module", hello_list + ("pen2-cython",))
10-
def dist(session, module):
8+
@nox.parametrize("module", long_hello_list, ids=long_hello_list)
9+
def dist(session: nox.Session, module: str) -> None:
1110
session.cd(f"projects/{module}")
1211
session.install("build")
1312

14-
# Cleanup bad caching
15-
skbuild = Path("_skbuild")
16-
if skbuild.exists():
17-
shutil.rmtree(skbuild)
18-
1913
# Builds SDist and wheel
2014
session.run("pyproject-build")
2115

2216

2317
@nox.session
24-
@nox.parametrize("module", hello_list)
25-
def test(session, module):
18+
@nox.parametrize("module", hello_list, ids=hello_list)
19+
def test(session: nox.Session, module: str) -> None:
2620
session.cd(f"projects/{module}")
2721
session.install("pytest", "pytest-cov")
2822

29-
# Cleanup bad caching
30-
skbuild = Path("_skbuild")
31-
if skbuild.exists():
32-
shutil.rmtree(skbuild)
33-
3423
session.install(".")
3524
session.run("pytest")

projects/hello-cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4.0)
1+
cmake_minimum_required(VERSION 3.4...3.22)
22

33
project(hello)
44

projects/hello-cpp/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
requires = [
33
"setuptools>=42",
44
"wheel",
5-
"scikit-build>=0.12",
5+
"scikit-build>=0.13",
66
"cmake>=3.18",
77
"ninja",
88
]

projects/hello-cpp/setup.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
1-
import sys
2-
31
from skbuild import setup
42

5-
# Require pytest-runner only when running tests
6-
pytest_runner = (['pytest-runner>=2.0,<3dev']
7-
if any(arg in sys.argv for arg in ('pytest', 'test'))
8-
else [])
9-
10-
setup_requires = pytest_runner
11-
123
setup(
134
name="hello-cpp",
145
version="1.2.3",
156
description="a minimal example package (cpp version)",
167
author='The scikit-build team',
178
license="MIT",
189
packages=['hello'],
19-
tests_require=['pytest'],
20-
setup_requires=setup_requires
10+
python_requires=">=3.7",
2111
)

projects/hello-cython/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5.0)
1+
cmake_minimum_required(VERSION 3.5...3.22)
22

33
project(hello_cython)
44

projects/hello-cython/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
requires = [
33
"setuptools>=42",
44
"wheel",
5-
"scikit-build>=0.12",
5+
"scikit-build>=0.13",
66
"cmake>=3.18",
77
"ninja",
88
"cython",

projects/hello-cython/setup.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
import sys
2-
31
from skbuild import setup
42

5-
# Require pytest-runner only when running tests
6-
pytest_runner = (['pytest-runner>=2.0,<3dev']
7-
if any(arg in sys.argv for arg in ('pytest', 'test'))
8-
else [])
9-
10-
setup_requires = pytest_runner
113

124
setup(
135
name="hello-cython",
@@ -16,7 +8,5 @@
168
author='The scikit-build team',
179
license="MIT",
1810
packages=['hello'],
19-
install_requires=['cython'],
20-
tests_require=['pytest'],
21-
setup_requires=setup_requires
11+
python_requires=">=3.7",
2212
)

projects/hello-pure/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
requires = [
33
"setuptools>=42",
44
"wheel",
5-
"scikit-build>=0.12",
5+
"scikit-build>=0.13",
66
"cmake>=3.18",
77
"ninja",
88
]

projects/hello-pure/setup.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
import sys
2-
31
from skbuild import setup
42

5-
# Require pytest-runner only when running tests
6-
pytest_runner = (['pytest-runner>=2.0,<3dev']
7-
if any(arg in sys.argv for arg in ('pytest', 'test'))
8-
else [])
9-
10-
setup_requires = pytest_runner
113

124
setup(
135
name="hello-pure",
@@ -16,6 +8,5 @@
168
author='The scikit-build team',
179
license="MIT",
1810
packages=['hello'],
19-
tests_require=['pytest'],
20-
setup_requires=setup_requires
11+
python_requires=">=3.7",
2112
)

0 commit comments

Comments
 (0)