Skip to content

Commit

Permalink
Drop support for EOL python 3.6 and add support for pythong 3.10 (#275)
Browse files Browse the repository at this point in the history
  • Loading branch information
athackst committed Feb 13, 2022
1 parent 23ff492 commit 01f90e2
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Expand Up @@ -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
9 changes: 5 additions & 4 deletions tests/test_local.sh
Expand Up @@ -22,7 +22,7 @@ set -e
function docker_run_integration_tests() {
docker build -t mkdocs-simple-test-runner:$1 -f- . <<EOF
FROM python:$1
RUN apt-get -y update && apt-get -yyy install bats gcc
RUN apt-get -y update && apt-get -yyy install bats gcc sudo
COPY ./requirements.txt /workspace/requirements.txt
RUN pip install -r /workspace/requirements.txt
COPY . /workspace
Expand All @@ -35,14 +35,15 @@ docker run --rm -it mkdocs-simple-test-runner:$1 tests/run_linters.sh
docker run --rm -it mkdocs-simple-test-runner:$1 tests/run_integration_tests.sh
}

if [[ ! -z "$PYTHON_37_ONLY" ]]; then
docker_run_integration_tests "3.7"
if [[ ! -z "$PYTHON_V_ONLY" ]]; then
echo "only v $PYTHON_V_ONLY"
docker_run_integration_tests "$PYTHON_V_ONLY"
else
docker_run_integration_tests "3"
docker_run_integration_tests "3.6"
docker_run_integration_tests "3.7"
docker_run_integration_tests "3.8"
docker_run_integration_tests "3.9"
docker_run_integration_tests "3.10"
fi
# ```
# </details>
Expand Down

0 comments on commit 01f90e2

Please sign in to comment.