chore: drop Python 2 and 3.5 (#512)

* chore: drop Python 2 and 3.5, mostly using pyupgrade

* chore: continue to drop Python 2 workarounds

* chore: drop workarounds for Python 2

* refactor: a few more small places with Python 2

* refactor: a few more type: converted to real annotations

* ci: check all files not just changed ones

* ci: support pre-commit.ci

Author: henryiii

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: actions/setup-python@v2
     - uses: pre-commit/[email protected]
       with:
-        extra_args: --hook-stage manual
+        extra_args: -a --hook-stage manual
 
   clang-tidy:
     name: Clang-Tidy
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.5", "3.9", "pypy3"]
+        python-version: ["3.6", "3.9", "pypy3"]
         include:
         - python-version: "3.8"
           cmake-extras: "-DCMAKE_CXX_STANDARD=17"
@@ -92,7 +92,7 @@ jobs:
 
     - uses: joerick/[email protected]
       env:
-        CIBW_BUILD: cp38-win_amd64 cp27-manylinux_i686 cp37-macosx_x86_64
+        CIBW_BUILD: cp38-win_amd64 cp36-manylinux_i686 cp37-macosx_x86_64
         CIBW_TEST_EXTRAS: test
         CIBW_TEST_COMMAND: pytest {project}/tests
         CIBW_BUILD_VERBOSITY: 1

.github/workflows/wheels.yml

@@ -89,14 +89,14 @@ jobs:
         include:
           - os: ubuntu-latest
             arch: auto
-            build: "cp3* pp*"
+            build: "pp*"
             CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
             CIBW_MANYLINUX_I686_IMAGE: manylinux2010
 
           - os: ubuntu-latest
             type: ManyLinux1
             arch: auto
-            build: "cp{27,35,36,37,38}-*"
+            build: "cp{36,37,38}-*"
             CIBW_MANYLINUX_X86_64_IMAGE: skhep/manylinuxgcc-x86_64
             CIBW_MANYLINUX_I686_IMAGE: skhep/manylinuxgcc-i686
 
@@ -116,7 +116,6 @@ jobs:
     - uses: joerick/[email protected]
       env:
         CIBW_BUILD: ${{ matrix.build }}
-        CIBW_SKIP: cp27-win* pp27-win*
         CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.CIBW_MANYLINUX_I686_IMAGE }}
         CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.CIBW_MANYLINUX_X86_64_IMAGE }}
         CIBW_ARCHS: ${{ matrix.arch }}
@@ -131,48 +130,9 @@ jobs:
         path: wheelhouse/*.whl
 
 
-  # Windows 2.7 (requires pybind11 workaround)
-  build_win27_wheels:
-    name: Py 2.7 wheels on Windows
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        submodules: true
-
-    - uses: ilammy/msvc-dev-cmd@v1
-
-    - name: Build 64-bit wheel
-      uses: joerick/[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: joerick/[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_arch_wheels, build_sdist]
+    needs: [build_wheels, build_arch_wheels, build_sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
 

.pre-commit-config.yaml

@@ -1,3 +1,6 @@
+ci:
+  skip: [docker-clang-format]
+
 repos:
 - repo: https://github.com/psf/black
   rev: 20.8b1
@@ -22,7 +25,6 @@ repos:
   - id: check-yaml
   - id: debug-statements
   - id: end-of-file-fixer
-  - id: fix-encoding-pragma
   - id: mixed-line-ending
   - id: requirements-txt-fixer
   - id: trailing-whitespace
@@ -37,6 +39,7 @@ repos:
   rev: v2.10.0
   hooks:
   - id: pyupgrade
+    args: [--py36-plus]
 
 - repo: https://github.com/PyCQA/isort
   rev: 5.7.0
@@ -47,7 +50,6 @@ repos:
   rev: v1.16.0
   hooks:
   - id: setup-cfg-fmt
-    args: [--min-py3-version, "3.5"]
 
 - repo: https://github.com/pycqa/flake8
   rev: 3.8.4
@@ -61,6 +63,7 @@ repos:
   hooks:
   - id: mypy
     files: src
+    additional_dependencies: [numpy==1.20.1]
 
 - repo: https://github.com/mgedmin/check-manifest
   rev: "0.46"

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10...3.18)
+cmake_minimum_required(VERSION 3.10...3.19)
 
 project(BOOST_HISTOGRAM LANGUAGES CXX)
 # Version is added later
@@ -120,10 +120,6 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MATC
     target_compile_options(_core PRIVATE -Werror)
   endif()
 
-  # Python 2 will not be compatible with C++17, but let's not be reminded of that over and over again here.
-  if("${PYTHON_VERSION_MAJOR}" LESS 3 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    target_compile_options(_core PRIVATE -Wno-deprecated-register)
-  endif()
 elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
   target_compile_options(_core PRIVATE /W4)
   if(BOOST_HISTOGRAM_ERRORS)

CONTRIBUTING.md

@@ -27,11 +27,12 @@ git submodule update --init --depth 10
 
 While developers often work in CMake, the "correct" way to develop a python
 package is in a virtual environment. This is how you would set one up with
-Python 3:
+Python's built-in venv:
 
 ```bash
 python3 -m venv .env
 source ./.env/bin/activate
+pip install -U pip
 pip install -ve .[all]
 ```
 

README.md

@@ -165,19 +165,18 @@ Wheels are produced using [cibuildwheel](https://cibuildwheel.readthedocs.io/en/
 
 | System | Arch | Python versions | PyPy versions |
 |---------|-----|------------------|--------------|
-| ManyLinux1 (custom GCC 9.2) | 32 & 64-bit | 2.7, 3.5, 3.6, 3.7, 3.8 | |
-| ManyLinux2010 | 32 & 64-bit | 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 | 7.3: 2.7, 3.6, 3.7 |
+| ManyLinux1 (custom GCC 9.2) | 32 & 64-bit | 3.6, 3.7, 3.8 | |
+| ManyLinux2010 | 32 & 64-bit | 3.6, 3.7, 3.8, 3.9 | 7.3: 3.6, 3.7 |
 | ManyLinux2014 | ARM64 | 3.6, 3.7, 3.8, 3.9 | |
-| macOS 10.9+ | 64-bit | 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 | 7.3: 2.7, 3.6, 3.7 |
+| macOS 10.9+ | 64-bit | 3.6, 3.7, 3.8, 3.9 | 7.3: 3.6, 3.7 |
 | macOS Universal2 | Arm64 | 3.9 | |
-| Windows | 32 & 64-bit | 2.7, 3.5, 3.6, 3.7, 3.8, 3.9 | (32 bit) 7.3: 2.7, 3.6, 3.7 |
+| Windows | 32 & 64-bit | 3.6, 3.7, 3.8, 3.9 | (32 bit) 7.3: 3.6, 3.7 |
 
 
 * manylinux1: Using a custom docker container with GCC 9; should work but can't be called directly other compiled extensions unless they do the same thing (think that's the main caveat). Supporting 32 bits because it's there. Anything running Python 3.9 should be compatible with manylinux2010, so manylinux1 not provided for Python 3.9 (like NumPy).
 * manylinux2010: Requires pip 10+ and a version of Linux newer than 2010.
-* Windows: pybind11 requires compilation with a newer copy of Visual Studio than Python 2.7's Visual Studio 2008; you need to have the [Visual Studio 2015 distributable][msvc2015] installed (the dll is included in 2017 and 2019, as well).
-* PyPy: Supported on all platforms that `cibuildwheel` supports, in pypy2, pypy3.6, and pypy3.7 variants.
-* ARM on Linux is supported for newer Python versions via manylinux2014. PowerPC or IBM-Z available on request.
+* PyPy: Supported  for both pypy3.6 and pypy3.7 variants.
+* ARM on Linux is supported for newer Python versions via `manylinux2014`. PowerPC or IBM-Z available on request, or `manylinux_2_24`.
 * macOS Universal2 wheels for Apple Silicon and Intel provided for Python 3.9 (requires Pip 21.0.1).
 
 [msvc2015]: https://www.microsoft.com/en-us/download/details.aspx?id=48145
@@ -187,7 +186,7 @@ If you are on a Linux system that is not part of the "many" in manylinux, such a
 
 #### Conda-Forge
 
-The boost-histogram package is available on Conda-Forge, as well. All supported versions are available with the exception of Python 2.7, which is no longer supported by conda-forge directly.
+The boost-histogram package is available on Conda-Forge, as well. All supported variants are available.
 
 ```bash
 conda install -c conda-forge boost-histogram
@@ -197,8 +196,6 @@ conda install -c conda-forge boost-histogram
 
 For a source build, for example from an "sdist" package, the only requirements are a C++14 compatible compiler. The compiler requirements are dictated by Boost.Histogram's C++ requirements: gcc >= 5.5, clang >= 3.8, msvc >= 14.1. You should have a version of pip less than 2-3 years old (10+).
 
-If you are using Python 2.7 on Windows, you will need to use a recent version of Visual studio and force distutils to use it, or just upgrade to Python 3.6 or newer. Check the pybind11 documentation for [more help](https://pybind11.readthedocs.io/en/stable/faq.html#working-with-ancient-visual-studio-2009-builds-on-windows). On some Linux systems, you may need to use a newer compiler than the one your distribution ships with.
-
 Boost is not required or needed (this only depends on included header-only dependencies). This library is under active development; you can install directly from GitHub if you would like.
 
 ```bash

dev-requirements.txt

@@ -1,7 +1,7 @@
+dataclasses; python_version<'3.7'
 numpy
 pytest !=6.1.0
 pytest-benchmark
 setuptools >=42
 setuptools_scm[toml] >=3.4,!=4.0.0
-typing; python_version < '3.5'
-typing_extensions
+typing_extensions; python_version<'3.8'

docs/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Version 1.0
 
+Dropped support for Python 2 and 3.5; removed large numbers of workarounds.
+
 * Removed deprecated `.options` from axes. Use `.traits` instead. [#503][]
 
 [#503]: https://github.com/scikit-hep/boost-histogram/pull/503

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # To regenerate API docs:
 # sphinx-apidoc -o api ../src/boost_histogram -M -f -t template/
 

docs/usage/axes.rst

@@ -111,7 +111,7 @@ Category axis
 
    You should put integers in a category axis; but unlike an integer axis, the integers do not need to be adjacent.
 
-One use for an IntCategory axis is for an IntEnum (Python 3):
+One use for an IntCategory axis is for an IntEnum:
 
 .. code:: python3