Add support for Python 3.10 (#114)

* drop Python 3.6 on MacOS
* update pre-commits, flake8, isort, black
* update setup layout towards setup.cfg
* update dependencies

closes #112, closes #113

Author: Anthchirp

.azure-pipelines.yml

@@ -15,20 +15,26 @@ stages:
     pool:
       vmImage: ubuntu-latest
     steps:
-      # Use Python >=3.7 for syntax validation
+      # Run syntax validation using oldest and latest Python
       - task: UsePythonVersion@0
         displayName: Set up python
         inputs:
-          versionSpec: 3.7
+          versionSpec: 3.6
 
-      # Run syntax validation on a shallow clone
-      - bash: |
-          python .azure-pipelines/syntax-validation.py
-        displayName: Syntax validation
+      - bash: python .azure-pipelines/syntax-validation.py
+        displayName: Syntax validation (3.6)
+
+      - task: UsePythonVersion@0
+        displayName: Set up python
+        inputs:
+          versionSpec: 3.10
+
+      - bash: python .azure-pipelines/syntax-validation.py
+        displayName: Syntax validation (3.10)
 
-      # Run flake8 validation on a shallow clone
+      # Run flake8 validation
       - bash: |
-          pip install flake8
+          pip install --disable-pip-version-check flake8 && \
           python .azure-pipelines/flake8-validation.py
         displayName: Flake8 validation
 
@@ -48,6 +54,8 @@ stages:
           PYTHON_VERSION: 3.8
         python39:
           PYTHON_VERSION: 3.9
+        python310:
+          PYTHON_VERSION: 3.10
     steps:
     - template: .azure-pipelines/ci.yml
 
@@ -56,14 +64,14 @@ stages:
       vmImage: macOS-latest
     strategy:
       matrix:
-        python36:
-          PYTHON_VERSION: 3.6
         python37:
           PYTHON_VERSION: 3.7
         python38:
           PYTHON_VERSION: 3.8
         python39:
           PYTHON_VERSION: 3.9
+        python310:
+          PYTHON_VERSION: 3.10
     steps:
     - template: .azure-pipelines/ci.yml
 
@@ -80,6 +88,8 @@ stages:
           PYTHON_VERSION: 3.8
         python39:
           PYTHON_VERSION: 3.9
+        python310:
+          PYTHON_VERSION: 3.10
     steps:
     - template: .azure-pipelines/ci.yml
 
@@ -98,7 +108,7 @@ stages:
       - task: UsePythonVersion@0
         displayName: Set up python
         inputs:
-          versionSpec: 3.8
+          versionSpec: 3.9
 
       - bash: |
           python -m pip install -r requirements_dev.txt

.azure-pipelines/flake8-validation.py

@@ -8,8 +8,6 @@
         [
             "flake8",
             "--exit-zero",
-            "--max-line-length=88",
-            "--select=E401,E711,E712,E713,E714,E721,E722,E901,F401,F402,F403,F405,F631,F632,F633,F811,F812,F821,F822,F841,F901,W191,W291,W292,W293,W602,W603,W604,W605,W606",
         ],
         capture_output=True,
         check=True,

.bumpversion.cfg

@@ -3,11 +3,10 @@ current_version = 2.3.0
 commit = True
 tag = True
 
-[bumpversion:file:setup.py]
-search = version="{current_version}"
-replace = version="{new_version}"
+[bumpversion:file:setup.cfg]
+search = version = {current_version}
+replace = version = {new_version}
 
 [bumpversion:file:procrunner/__init__.py]
 search = __version__ = "{current_version}"
 replace = __version__ = "{new_version}"
-

.pre-commit-config.yaml

@@ -2,24 +2,31 @@ repos:
 
 # Automatically sort imports
 - repo: https://github.com/PyCQA/isort
-  rev: 5.6.4
+  rev: 5.9.3
   hooks:
   - id: isort
 
 # Automatic source code formatting
 - repo: https://github.com/psf/black
-  rev: 21.4b2
+  rev: 21.6b0
   hooks:
   - id: black
     args: [--safe, --quiet]
 
-# Syntax check and some basic flake8
+# Linting
+- repo: https://github.com/PyCQA/flake8
+  rev: 3.9.2
+  hooks:
+  - id: flake8
+    additional_dependencies: ['flake8-comprehensions==3.5.0']
+
+# Syntax validation and some basic sanity checks
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.0.0
+  rev: v4.0.1
   hooks:
+  - id: check-merge-conflict
   - id: check-ast
   - id: check-json
+  - id: check-added-large-files
+    args: ['--maxkb=200']
   - id: check-yaml
-  - id: flake8
-    args: ['--max-line-length=88', '--select=E401,E711,E712,E713,E714,E721,E722,E901,F401,F402,F403,F405,F631,F632,F633,F811,F812,F821,F822,F841,F901,W191,W291,W292,W293,W602,W603,W604,W605,W606']
-  - id: check-merge-conflict

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Diamond Light Source.
+Copyright (c) 2018-2021 Diamond Light Source.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

requirements_dev.txt

@@ -1,7 +1,6 @@
 bump2version==1.0.1
-coverage==5.5
-flake8==3.9.2
-pip==21.2.4
+coverage==6.0.2
+pip==21.3.1
 pytest==6.2.5
 Sphinx==4.2.0
 tox==3.24.4

setup.cfg

@@ -1,11 +1,44 @@
 [metadata]
+name = procrunner
+description = Versatile utility function to run external processes
+version = 2.3.0
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    Natural Language :: English
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Operating System :: OS Independent
+    Topic :: Software Development :: Libraries :: Python Modules
+license = BSD
+license_file = LICENSE
 project-urls =
+    Download = https://github.com/DiamondLightSource/python-procrunner/tags
     Documentation = https://procrunner.readthedocs.io/
     GitHub = https://github.com/DiamondLightSource/python-procrunner
     Bug-Tracker = https://github.com/DiamondLightSource/python-procrunner/issues
 
 [flake8]
-exclude = docs
+# Black disagrees with flake8 on a few points. Ignore those.
+ignore = E203, E266, E501, W503
+# E203 whitespace before ':'
+# E266 too many leading '#' for block comment
+# E501 line too long
+# W503 line break before binary operator
+
+max-line-length = 88
+
+select =
+    E401,E711,E712,E713,E714,E721,E722,E901,
+    F401,F402,F403,F405,F541,F631,F632,F633,F811,F812,F821,F822,F841,F901,
+    W191,W291,W292,W293,W602,W603,W604,W605,W606,
+    # flake8-comprehensions, https://github.com/adamchainz/flake8-comprehensions
+    C4,
 
 [aliases]
 test = pytest

setup.py

@@ -18,32 +18,15 @@
 setup(
     author="Markus Gerstel",
     author_email="[email protected]",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: BSD License",
-        "Natural Language :: English",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-    ],
-    description="Versatile utility function to run external processes",
     install_requires=requirements,
-    license="BSD license",
     long_description=readme + "\n\n" + history,
     include_package_data=True,
     keywords="procrunner",
-    name="procrunner",
     packages=find_packages(include=["procrunner"]),
     python_requires=">=3.6",
     setup_requires=setup_requirements,
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/DiamondLightSource/python-procrunner",
-    version="2.3.0",
     zip_safe=False,
 )