Skip to content

Commit

Permalink
Merge pull request #156 from UNFmontreal/remove_python3.6
Browse files Browse the repository at this point in the history
[WIP] Remove python3.6
  • Loading branch information
arnaudbore authored Apr 14, 2022
2 parents 1a083cf + 986d2c2 commit dc3b54c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions dcm2bids/scaffold/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
9 changes: 2 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand Down
9 changes: 4 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit dc3b54c

Please sign in to comment.