Skip to content

Commit

Permalink
drop support for Python 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
simonbray committed Jul 7, 2022
1 parent 7f4c8f6 commit 4cac87d
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
tox-env:
type: string
docker:
- image: circleci/python:3.6-node
- image: circleci/python:3.7-node
steps:
- checkout
- run: git submodule sync
Expand All @@ -19,7 +19,7 @@ workflows:
matrix:
parameters:
tox-env:
- "py36-diagnostic-unit-servebasic-gx-dev"
- "py36-unit-nonredundant-noclientbuild-noshed-gx-2005"
- "py36-unit-nonredundant-noclientbuild-noshed-gx-dev"
- "py36-unit-nonredundant-noclientbuild-noshed"
- "py37-diagnostic-unit-servebasic-gx-dev"
- "py37-unit-nonredundant-noclientbuild-noshed-gx-2005"
- "py37-unit-nonredundant-noclientbuild-noshed-gx-dev"
- "py37-unit-nonredundant-noclientbuild-noshed"
8 changes: 4 additions & 4 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Before you submit a pull request, check that it meets these guidelines:

1. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring.
2. The pull request should work for Python >=3.6. Check
2. The pull request should work for Python >=3.7. Check
https://travis-ci.org/galaxyproject/planemo/pull_requests
and make sure that the tests pass for all supported Python versions.

Expand Down Expand Up @@ -156,10 +156,10 @@ testing environment. Planemo defines the following environments:
``py37-lint_docstrings``
Lint the project Python docstrings (doesn't pass currently).

``py36-unit-quick``
Run the fastest unit tests (with least external dependencies) on Python 3.6.
``py37-unit-quick``
Run the fastest unit tests (with least external dependencies) on Python 3.7.

``py36-unit-nonredundant-noclientbuild-gx-2005``
``py37-unit-nonredundant-noclientbuild-gx-2005``
Run tests that are marked as targeting a Galaxy branch and test against Galaxy 20.05.
Skip tests that are marked as redundant or that require a Galaxy client build.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ flake8: ## check style using flake8 for current Python (faster than lint)
$(IN_VENV) flake8 $(SOURCE_DIR) $(TEST_DIR)

lint: ## check style using tox and flake8 for Python 2 and Python 3
$(IN_VENV) tox -e py36-lint
$(IN_VENV) tox -e py37-lint

test: ## run tests with the default Python (faster than tox)
$(IN_VENV) pytest $(TESTS)
Expand Down
5 changes: 3 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ Obtaining
-----------------

For a traditional Python installation of Planemo, first set up a virtualenv
for ``planemo`` (this example creates a new one in ``.venv``) and then
install with ``pip``. Planemo requires pip 7.0 or newer.
for ``planemo`` (this example creates a new one in ``.venv``) containing
Python 3.7 or newer and then install with ``pip``. Planemo must be installed
with pip 7.0 or newer.

::

Expand Down
2 changes: 1 addition & 1 deletion planemo/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def galaxy_python_version():
"--galaxy_python_version",
use_global_config=True,
default=None,
type=click.Choice(["3", "3.6", "3.7", "3.8", "3.9"]),
type=click.Choice(["3", "3.7", "3.8", "3.9"]),
help="Python version to start Galaxy under",
)

Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
except ImportError:
from distutils.core import setup

if sys.version_info < (3, 6):
sys.stderr.write("ERROR: planemo requires at least Python Version 3.6\n")
if sys.version_info < (3, 7):
sys.stderr.write("ERROR: planemo requires at least Python version 3.7\n")
sys.exit(1)

# Allow installer to turn off dependency on lxml by setting the environment variable
Expand Down Expand Up @@ -125,7 +125,6 @@ def get_var(var_name):
"Topic :: Software Development :: Testing",
"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",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{36}-lint, py36-unit-quick, py36-lint_docstrings, py36-lint_docs, py{36,37}-unit, py36-gxwf_test_test
envlist = py{37}-lint, py37-unit-quick, py37-lint_docstrings, py37-lint_docs, py{37}-unit, py37-gxwf_test_test
source_dir = planemo
test_dir = tests

Expand Down

0 comments on commit 4cac87d

Please sign in to comment.