diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 27e481fb..6aa28bbe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: - ubuntu-latest # ubuntu-18.04 - macos-latest # macOS-10.14 - windows-latest # windows-2019 - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v1 diff --git a/dcm2bids/scaffold/__init__.py b/dcm2bids/scaffold/__init__.py index d0a1cabb..92a088ad 100644 --- a/dcm2bids/scaffold/__init__.py +++ b/dcm2bids/scaffold/__init__.py @@ -6,12 +6,7 @@ import datetime import os import shutil -if sys.version_info >= (3,7,0): - import importlib.resources as resources -else: - # backport: https://pypi.org/project/importlib-resources/ - # TODO: drop this when py3.6 is end-of-life - import importlib_resources as resources +import importlib.resources as resources from ..utils import write_txt diff --git a/setup.py b/setup.py index 36586ec4..a252cae0 100755 --- a/setup.py +++ b/setup.py @@ -55,7 +55,6 @@ def install_requires(): "Operating System :: Microsoft :: Windows", "Operating System :: Unix", "Programming Language :: Python", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", @@ -71,14 +70,10 @@ def install_requires(): version=VERSION, packages=find_packages(exclude=["tests"]), entry_points=ENTRY_POINTS, - python_requires=">=3.6", + python_requires=">=3.7", use_scm_version=True, setup_requires=['setuptools_scm'], - install_requires=[ - 'future>=0.17.1', - # TODO: drop this when py3.6 is end-of-life - 'importlib_resources ; python_version<"3.7"', - ], + install_requires=['future>=0.17.1'], include_package_data=True, author=AUTHOR, author_email=AUTHOR_EMAIL, diff --git a/tox.ini b/tox.ini index f5444bc0..b0d10f6f 100644 --- a/tox.ini +++ b/tox.ini @@ -4,12 +4,11 @@ # and then run "tox" from this directory. [tox] -envlist = py36, py37, py38, py39 -; envlist = clean, py36, py37, py38, py39, report +envlist = py37, py38, py39 +; envlist = clean, py37, py38, py39, report [gh-actions] python = - 3.6: py36 3.7: py37 3.8: py38 3.9: py39 @@ -19,8 +18,8 @@ deps = -rrequirements-test.txt commands = pytest --cov --cov-report=xml -s ; commands = pytest --cov --cov-append --black --flake8 --pylint ; depends = -; {py36, py37, py38}: clean -; report: py36, py37, py38, py39 +; {py37, py38, py39}: clean +; report: py37, py38, py39 ; [testenv:report] ; deps = coverage