chore: bump versions (#16)

* chore: bump to version 2.7.1 & add nox

* ci: run simpler & more Windows runs

.github/workflows/conda.yml

@@ -32,7 +32,7 @@ jobs:
           channels: conda-forge
           
       - name: Prepare
-        run: conda install conda-build conda-verify
+        run: conda install conda-build conda-verify pytest
 
       - name: Build
         run: conda build conda.recipe
@@ -41,4 +41,4 @@ jobs:
         run: conda install -c ${CONDA_PREFIX}/conda-bld/ scikit_build_example
 
       - name: Test
-        run: python tests/test.py
+        run: pytest tests

.github/workflows/pip.yml

@@ -8,36 +8,13 @@ on:
       - master
 
 jobs:
-  make_dist:
-    name: Make distributions
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        repository: pybind/pybind11
-
-    - uses: actions/setup-python@v2
-
-    - name: Download requirements
-      run: python -m pip install build
-
-    - name: Build files
-      run: |
-        python -m build
-        PYBIND11_GLOBAL_SDIST=ON python -m build
-
-    - uses: actions/upload-artifact@v2
-      with:
-        path: dist/*
-
   build:
     name: Build with Pip
-    needs: [make_dist]
     strategy:
       fail-fast: false
       matrix:
         platform: [windows-latest, macos-latest, ubuntu-latest]
-        python-version: ["2.7", "3.5", "3.8"]
+        python-version: ["2.7", "3.5", "3.9", "3.10-dev"]
 
         exclude:
           # Not supported by scikit-build
@@ -49,11 +26,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - uses: actions/download-artifact@v2
-      with:
-        name: artifact
-        path: dist
-
     - uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
@@ -61,16 +33,8 @@ jobs:
     - name: Add requirements
       run: python -m pip install --upgrade wheel setuptools
 
-    # Eventually Microsoft might have an action for setting up
-    # MSVC, but for now, this action works:
-    - name: Prepare compiler environment for Windows 🐍 2.7
-      if: runner.os == 'Windows'
-      uses: ilammy/msvc-dev-cmd@v1.9.0
-      with:
-        arch: x64
-
     - name: Build and install
-      run: pip install --verbose . --find-links ${{ github.workspace }}/dist
+      run: pip install --verbose .[test]
 
     - name: Test
-      run: python tests/test.py
+      run: pytest

.github/workflows/wheels.yml

@@ -11,7 +11,8 @@ on:
       - published
 
 env:
-  CIBW_TEST_COMMAND: python {project}/tests/test.py
+  CIBW_TEST_COMMAND: pytest {project}/tests
+  CIBW_TEST_EXTRAS: test
 
 
 jobs:
@@ -40,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]  # Windows wheels currently not supported very well by scikit-build
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
     - uses: actions/checkout@v2

conda.recipe/meta.yaml

@@ -28,10 +28,12 @@ requirements:
 test:
   imports:
     - scikit_build_example
+  requires:
+    - pytest
   source_files:
     - tests
   commands:
-    - python tests/test.py
+    - pytest tests
 
 about:
   summary: An example project built with pybind11 and scikit-build.

noxfile.py

+import nox
+
+
+nox.options.sessions = ["lint", "tests"]
+
+
+@nox.session
+def lint(session: nox.Session) -> None:
+    """
+    Run the linter.
+    """
+    session.install("pre-commit")
+    session.run("pre-commit", "run", "--all-files", *session.posargs)
+
+
+@nox.session
+def tests(session: nox.Session) -> None:
+    """
+    Run the unit and regular tests.
+    """
+    session.install(".[test]")
+    session.run("pytest", *session.posargs)

pyproject.toml

@@ -2,9 +2,9 @@
 requires = [
     "setuptools>=42",
     "wheel",
-    "pybind11~=2.6.0",
-    "cmake",
-    "scikit-build",
+    "pybind11>=2.7.1",
+    "cmake>=3.21",
+    "scikit-build>=0.12",
 ]
 
 build-backend = "setuptools.build_meta"

setup.py

@@ -27,4 +27,5 @@ setup(
     package_dir={"": "src"},
     cmake_install_dir="src/scikit_build_example",
     include_package_data = True,
+    extras_require={"test": ["pytest"]},
 )

tests/test.py

-# -*- coding: utf-8 -*-
-import scikit_build_example as m
-
-assert m.__version__ == "0.0.1"
-assert m.add(1, 2) == 3
-assert m.subtract(1, 2) == -1

tests/test_basic.py

+# -*- coding: utf-8 -*-
+import scikit_build_example as m
+
+
+def test_version():
+    assert m.__version__ == "0.0.1"
+
+
+def test_add():
+    assert m.add(1, 2) == 3
+
+
+def test_sub():
+    assert m.subtract(1, 2) == -1