From 75411eccfcf455e7afb6e7d7cfc351f5c40b57ec Mon Sep 17 00:00:00 2001 From: James Kent Date: Tue, 17 Dec 2019 02:08:16 -0600 Subject: [PATCH 1/4] add python 3.8 to testing matrix --- .travis.yml | 7 +++++++ tox.ini | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f09996..b026bfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,13 @@ jobs: python: '3.7' env: - TOXENV=py37,report,codecov + - stage: test + before_install: + - sudo apt-get update + - sudo apt-get install -y graphviz + python: '3.8' + env: + - TOXENV=py38 - stage: deploy install: skip script: skip diff --git a/tox.ini b/tox.ini index dc7f3f4..93859b4 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist = clean, check, - {py35,py36,py37}, + {py35,py36,py37,py38}, report, codecov, docs @@ -17,6 +17,7 @@ basepython = py35: {env:TOXPYTHON:python3.5} py36: {env:TOXPYTHON:python3.6} py37: {env:TOXPYTHON:python3.7} + py38: {env:TOXPYTHON:python3.8} {clean,check,codecov,docs,report}: {env:TOXPYTHON:python3} setenv = PYTHONPATH={toxinidir} From 642499f82adfbe8c8eaa5199e9081202ee2b31e3 Mon Sep 17 00:00:00 2001 From: James Kent Date: Tue, 17 Dec 2019 02:08:37 -0600 Subject: [PATCH 2/4] add python 3.8 to project metadata --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 204f02a..3ba5754 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,6 +19,7 @@ classifiers = Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Topic :: Utilities keywords = bids From a1804080b13c021dd4836c28bbd27608fcee7224 Mon Sep 17 00:00:00 2001 From: James Kent Date: Tue, 17 Dec 2019 09:24:46 -0600 Subject: [PATCH 3/4] bump numpy and scikit learn versions to minimum for python 3.8 support --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3ba5754..beb9608 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,10 +35,10 @@ install_requires = nistats == 0.0.1b1 nilearn ~= 0.4.2 pandas ~= 0.24.0 - numpy + numpy >= 1.17.3 niworkflows ~= 1.0.2 duecredit ~= 0.6.4 - scikit-learn ~= 0.19.2 + scikit-learn >= 0.22.0 matplotlib ~= 2.2.4 mne ~= 0.18.1 pypiwin32; platform_system=="Windows" From 77873dab7df017c8eb79e7b3733339a93d92d5bf Mon Sep 17 00:00:00 2001 From: James Kent Date: Tue, 17 Dec 2019 10:07:33 -0600 Subject: [PATCH 4/4] add conditional matplotlib dependency --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index beb9608..055310e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,7 +39,8 @@ install_requires = niworkflows ~= 1.0.2 duecredit ~= 0.6.4 scikit-learn >= 0.22.0 - matplotlib ~= 2.2.4 + matplotlib >= 3.1.2; python_version>"3.5" + matplotlib; python_version=="3.5" mne ~= 0.18.1 pypiwin32; platform_system=="Windows"