chore: require Python 3.6+ (#64)

* chore: bump to pybind11 2.8.0

* chore: drop Python 2 support, require 3.6+

* style: run pre-commit

* refactor: clean up settings a bit, require PyTest 6+

Author: henryiii

.appveyor.yml

@@ -9,7 +9,6 @@ environment:
     PYTHONWARNINGS: ignore:DEPRECATION
     MSSdk: 1
   matrix:
-  - PYTHON: 27
   - PYTHON: 36
 install:
 - cmd: '"%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PLATFORM%'

setup.cfg renamed to .flake8

@@ -3,8 +3,3 @@
 ignore = E203, E231, E501, W503, B950
 select = C,E,F,W,B,B9
 exclude = docs/conf.py
-
-[tool:pytest]
-addopts = -ra
-testpaths =
-    tests

.github/workflows/pip.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [windows-latest, macos-latest, ubuntu-latest]
-        python-version: ["2.7", "3.5", "3.8", "3.9"]
+        python-version: ["3.6", "3.8", "3.10"]
 
     runs-on: ${{ matrix.platform }}
 
@@ -29,22 +29,6 @@ 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: matrix.python-version == 2.7 && runner.os == 'Windows'
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-
-    # This makes two environment variables available in the following step(s)
-    - name: Set Windows 🐍 2.7 environment variables
-      if: matrix.python-version == 2.7 && runner.os == 'Windows'
-      shell: bash
-      run: |
-        echo "DISTUTILS_USE_SDK=1" >> $GITHUB_ENV
-        echo "MSSdk=1" >> $GITHUB_ENV
-
     - name: Build and install
       run: pip install --verbose .[test]
 

.github/workflows/wheels.yml

@@ -10,11 +10,6 @@ on:
     types:
       - published
 
-env:
-  CIBW_TEST_COMMAND: pytest {project}/tests
-  CIBW_TEST_EXTRAS: test
-
-
 jobs:
   build_sdist:
     name: Build SDist
@@ -48,15 +43,9 @@ jobs:
       with:
         submodules: true
 
-    - uses: pypa/cibuildwheel@v1.12.0
+    - uses: pypa/cibuildwheel@v2.2.0
       env:
-        # Python 2.7 on Windows requires a workaround for C++11 support,
-        # built separately below
-        CIBW_SKIP: cp27-win*
         CIBW_ARCHS_MACOS: auto universal2
-        CIBW_TEST_SKIP: "*universal2:arm64"
-        CIBW_TEST_EXTRAS: test
-        CIBW_TEST_COMMAND: pytest {project}/tests
 
     - name: Verify clean directory
       run: git diff --exit-code
@@ -68,48 +57,9 @@ jobs:
         path: wheelhouse/*.whl
 
 
-  # Windows 2.7 (requires workaround for MSVC 2008 replacement)
-  build_win27_wheels:
-    name: Py 2.7 wheels on Windows
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - uses: ilammy/msvc-dev-cmd@v1
-
-    - name: Build 64-bit wheel
-      uses: pypa/[email protected]
-      env:
-        CIBW_BUILD: cp27-win_amd64
-        DISTUTILS_USE_SDK: 1
-        MSSdk: 1
-
-    - uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x86
-
-    - name: Build 32-bit wheel
-      uses: pypa/[email protected]
-      env:
-        CIBW_BUILD: cp27-win32
-        DISTUTILS_USE_SDK: 1
-        MSSdk: 1
-
-    - name: Verify clean directory
-      run: git diff --exit-code
-      shell: bash
-
-    - uses: actions/upload-artifact@v2
-      with:
-        path: wheelhouse/*.whl
-
-
   upload_all:
     name: Upload if release
-    needs: [build_wheels, build_win27_wheels, build_sdist]
+    needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
 

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "pybind11"]
-	path = pybind11
-	url = https://github.com/pybind/pybind11.git
-	branch = master
+    path = pybind11
+    url = https://github.com/pybind/pybind11.git
+    branch = master

.pre-commit-config.yaml

@@ -12,38 +12,71 @@
 #
 # See https://github.com/pre-commit/pre-commit
 
+ci:
+  autoupdate_commit_msg: "chore: update pre-commit hooks"
+  autofix_commit_msg: "style: pre-commit fixes"
+
 repos:
 # Standard hooks
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
+  rev: v4.0.1
   hooks:
   - id: check-added-large-files
   - id: check-case-conflict
   - id: check-merge-conflict
   - id: check-symlinks
   - id: check-yaml
+    exclude: ^conda\.recipe/meta\.yaml$
   - id: debug-statements
   - id: end-of-file-fixer
   - id: mixed-line-ending
   - id: requirements-txt-fixer
   - id: trailing-whitespace
-  - id: fix-encoding-pragma
 
 # Black, the code formatter, natively supports pre-commit
 - repo: https://github.com/psf/black
-  rev: 20.8b1
+  rev: 21.9b0
   hooks:
   - id: black
-    exclude: ^docs/conf.py$
+    exclude: ^(docs)
+
+# Sort your imports in a standard form
+- repo: https://github.com/PyCQA/isort
+  rev: 5.9.3
+  hooks:
+  - id: isort
+
+# Upgrade older Python syntax
+- repo: https://github.com/asottile/pyupgrade
+  rev: v2.29.0
+  hooks:
+  - id: pyupgrade
+    args: ["--py36-plus"]
 
 # Changes tabs to spaces
 - repo: https://github.com/Lucas-C/pre-commit-hooks
-  rev: v1.1.9
+  rev: v1.1.10
   hooks:
   - id: remove-tabs
+    exclude: ^(docs)
 
 - repo: https://gitlab.com/pycqa/flake8
   rev: 3.8.3
   hooks:
   - id: flake8
     additional_dependencies: [flake8-bugbear]
+
+# CMake formatting
+- repo: https://github.com/cheshirekow/cmake-format-precommit
+  rev: v0.6.13
+  hooks:
+  - id: cmake-format
+    additional_dependencies: [pyyaml]
+    types: [file]
+    files: (\.cmake|CMakeLists.txt)(.in)?$
+
+# Suggested hook if you add a .clang-format file
+# - repo: https://github.com/pre-commit/mirrors-clang-format
+#  rev: v13.0.0
+#  hooks:
+#  - id: clang-format

CMakeLists.txt

@@ -6,4 +6,5 @@ pybind11_add_module(cmake_example src/main.cpp)
 
 # EXAMPLE_VERSION_INFO is defined by setup.py and passed into the C++ code as a
 # define (VERSION_INFO) here.
-target_compile_definitions(cmake_example PRIVATE VERSION_INFO=${EXAMPLE_VERSION_INFO})
+target_compile_definitions(cmake_example
+                           PRIVATE VERSION_INFO=${EXAMPLE_VERSION_INFO})

README.md

@@ -29,21 +29,15 @@ existing CMake project structure. This is in many cases superseded by
 packages to be driven from CMake. However, there are still cases where you
 might want full control over the CMake run; and both of these approaches have
 some trade-offs not present in a pure setuptools build (see
-[`python_example`](https://github.com/pybind/python_example))
+[`python_example`](https://github.com/pybind/python_example)). Python 3.6+ required;
+see the commit history for older versions of Python.
 
 ## Prerequisites
 
-**On Unix (Linux, OS X)**
-
 * A compiler with C++11 support
-* CMake >= 3.4 or Pip 10+
+* Pip 10+ or CMake >= 3.4 (or 3.8+ on Windows, which was the first version to support VS 2015)
 * Ninja or Pip 10+
 
-**On Windows**
-
-* Visual Studio 2015 or newer (required for all Python versions, see notes below)
-* CMake >= 3.8 (3.8 was the first version to support VS 2015) or Pip 10+
-
 
 ## Installation
 
@@ -59,22 +53,6 @@ With the `setup.py` file included in this example, the `pip install` command wil
 invoke CMake and build the pybind11 module as specified in `CMakeLists.txt`.
 
 
-## Special notes for Windows
-
-**Compiler requirements**
-
-Pybind11 requires a C++11 compliant compiler, i.e Visual Studio 2015 on Windows.
-This applies to all Python versions, including 2.7. Unlike regular C extension
-modules, it's perfectly fine to compile a pybind11 module with a VS version newer
-than the target Python's VS version. See the [FAQ] for more details.
-
-**Runtime requirements**
-
-The Visual C++ 2015 redistributable packages are a runtime requirement for this
-project. It can be found [here][vs2015_runtime]. If you use the Anaconda Python
-distribution, you can add `vs2015_runtime` as a platform-dependent runtime
-requirement for you package: see the `conda.recipe/meta.yaml` file in this example.
-
 
 ## Building the documentation
 

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # python_exameple documentation build configuration file, created by
 # sphinx-quickstart on Fri Feb 26 00:29:33 2016.
@@ -12,8 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -52,18 +51,18 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'cmake_example'
-copyright = u'2016, Sylvain Corlay'
-author = u'Sylvain Corlay'
+project = 'cmake_example'
+copyright = '2016, Sylvain Corlay'
+author = 'Sylvain Corlay'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.0.1'
+version = '0.0.1'
 # The full version, including alpha/beta/rc tags.
-release = u'0.0.1'
+release = '0.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -228,8 +227,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'cmake_example.tex', u'cmake_example Documentation',
-     u'Sylvain Corlay', 'manual'),
+    (master_doc, 'cmake_example.tex', 'cmake_example Documentation',
+     'Sylvain Corlay', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -258,7 +257,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'cmake_example', u'cmake_example Documentation',
+    (master_doc, 'cmake_example', 'cmake_example Documentation',
      [author], 1)
 ]
 
@@ -272,7 +271,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'cmake_example', u'cmake_example Documentation',
+    (master_doc, 'cmake_example', 'cmake_example Documentation',
      author, 'cmake_example', 'One line description of project.',
      'Miscellaneous'),
 ]

pybind11

@@ -2,7 +2,22 @@
 requires = [
     "setuptools>=42",
     "wheel",
-    "ninja; sys_platform != 'win32' and platform_machine != 'arm64'",
+    "ninja",
     "cmake>=3.12",
 ]
 build-backend = "setuptools.build_meta"
+
+[tool.isort]
+profile = "black"
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
+xfail_strict = true
+filterwarnings = ["error"]
+testpaths = ["tests"]
+
+[tool.cibuildwheel]
+test-command = "pytest {project}/tests"
+test-extras = ["test"]
+test-skip = ["*universal2:arm64"]