Merge branch 'master' into pyup-update-sphinx-4.3.2-to-5.0.2

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.154.0/containers/python-3/.devcontainer/base.Dockerfile
 
-# [Choice] Python version: 3, 3.10, 3.9, 3.8, 3.7
+# [Choice] Python version: 3, 3.10, 3.11
 ARG VARIANT="3"
 FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
 
@@ -19,4 +19,4 @@ RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/shar
 #     && apt-get -y install --no-install-recommends <your-package-list-here>
 
 # [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

.devcontainer/devcontainer.json

@@ -5,8 +5,8 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"context": "..",
-		"args": { 
-			// Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8, 3.9
+		"args": {
+			// Update 'VARIANT' to pick a Python version: 3, 3.10, 3.11
 			"VARIANT": "3.10",
 			// Options
 			"INSTALL_NODE": "false",
@@ -15,7 +15,7 @@
 	},
 
 	// Set *default* container specific settings.json values on container create.
-	"settings": { 
+	"settings": {
 		"terminal.integrated.shell.linux": "/bin/bash",
 		"python.pythonPath": "/usr/local/bin/python",
 		"python.linting.enabled": true,

.github/workflows/python-package.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.10', '3.9', '3.8', '3.7']
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        python-version: [ '3.10', '3.11-dev' ]
     defaults:
       run:
         shell: pwsh

.mergify.yml

@@ -8,9 +8,9 @@ pull_request_rules:
   conditions:
   - label!=no-mergify
   - '#approved-reviews-by>=1'
-  - status-success=build (ubuntu-latest, 3.8)
-  - status-success=build (windows-latest, 3.8)
-  - status-success=build (macos-latest, 3.8)
+  - status-success=build (ubuntu-latest, 3.10)
+  - status-success=build (windows-latest, 3.10)
+  - status-success=build (macos-latest, 3.10)
   - status-success=codecov/project
   - status-success=pyup.io/safety-ci
 
@@ -23,19 +23,19 @@ pull_request_rules:
   conditions:
   - label!=no-mergify
   - author=NeonGraal
-  - status-success=build (ubuntu-latest, 3.8)
-  - status-success=build (windows-latest, 3.8)
-  - status-success=build (macos-latest, 3.8)
+  - status-success=build (ubuntu-latest, 3.10)
+  - status-success=build (windows-latest, 3.10)
+  - status-success=build (macos-latest, 3.10)
   - status-success=codecov/project
   - status-success=pyup.io/safety-ci
 
 - name: Automatic merge for PyUp PRs
   conditions:
   - label!=no-mergify
   - author=pyup-bot
-  - status-success=build (ubuntu-latest, 3.8)
-  - status-success=build (windows-latest, 3.8)
-  - status-success=build (macos-latest, 3.8)
+  - status-success=build (ubuntu-latest, 3.10)
+  - status-success=build (windows-latest, 3.10)
+  - status-success=build (macos-latest, 3.10)
   - status-success=codecov/project
   - status-success=pyup.io/safety-ci
   actions:

CONTRIBUTING.rst

@@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 3.6, 3.7, 3.8, 3.9, and for PyPy.
+3. The pull request should work for Python 3.10, 3.11, and for PyPy.
    Check that the tests pass for all supported Python versions.
 
 Tips

requirements_dev.txt

@@ -13,8 +13,8 @@ pytest-flake8==1.1.0
 pytest-mypy==0.9.1
 # pytest-annotate==1.0.2
 radon==5.1.0
-setuptools==62.4.0
-setuptools_scm==6.4.2
+setuptools==62.6.0
+setuptools_scm==7.0.2
 Sphinx==5.0.2
 tox==3.24.5
 types-setuptools==57.4.17

setup.py

@@ -27,10 +27,8 @@
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
     description="A python package for script (and command) virtualisation with less typing.",
     entry_points={

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37, py38, py39
+envlist = py310, py311
 
 [testenv]
 setenv =