diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1b5a1743..dbee3b54 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,7 +15,7 @@ }, // Set *default* container specific settings.json values on container create. "settings": { - "terminal.integrated.shell.linux": "/bin/bash", + "terminal.integrated.defaultProfile.linux": "bash", "python.pythonPath": "/usr/local/bin/python", "python.linting.enabled": true, "python.linting.pylintEnabled": true, diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f589c55f..489e210c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3, 3.6, 3.7, 3.8, 3.9] + python-version: [3, 3.7, 3.8, 3.9, 3.10] fail-fast: false steps: - uses: actions/checkout@v2.4.0 diff --git a/Dockerfile b/Dockerfile index 80911ed6..6cb9b52e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-alpine +FROM python:3.10-alpine ENV VIRTUAL_ENV=/opt/venv RUN python3 -m venv $VIRTUAL_ENV diff --git a/setup.py b/setup.py index 2e5fe690..7dd2e17d 100644 --- a/setup.py +++ b/setup.py @@ -33,15 +33,15 @@ 'Intended Audience :: Information Technology', 'Programming Language :: Python', 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9'], + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10'], packages=setuptools.find_packages(), entry_points={ 'mkdocs.plugins': ["simple = mkdocs_simple_plugin.plugin:SimplePlugin"], 'console_scripts': ["mkdocs_simple_gen = mkdocs_simple_plugin.generator:main"]}) # md file="versions.snippet" -# _Python 3.x, 3.6, 3.7, 3.8, 3.9 supported._ +# _Python 3.x, 3.7, 3.8, 3.9, 3.10 supported._ # /md diff --git a/tests/test_local.sh b/tests/test_local.sh index 8f2f0ab7..9bdeaf25 100755 --- a/tests/test_local.sh +++ b/tests/test_local.sh @@ -22,7 +22,7 @@ set -e function docker_run_integration_tests() { docker build -t mkdocs-simple-test-runner:$1 -f- . <