From ed2d7109e2108865a4141d068db73c2e988527d9 Mon Sep 17 00:00:00 2001 From: Joshua Teves Date: Fri, 15 Oct 2021 09:42:36 -0400 Subject: [PATCH 1/7] Add 3.10 unit test, compatibilities in info.py --- .circleci/config.yml | 36 ++++++++++++++++++++++++++++++++++++ tedana/info.py | 1 + 2 files changed, 37 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 84fd84d47..f8a341792 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -152,6 +152,40 @@ jobs: paths: - src/coverage/.coverage.py39 + unittest_310: + docker: + - image: continuumio/miniconda3 + working_directory: /tmp/src/tedana + steps: + - checkout + - restore_cache: + key: conda-py310-v1-{{ checksum "tedana/info.py" }} + - run: + name: Generate environment + command: | + apt-get update + apt-get install -yqq make + if [ ! -d /opt/conda/envs/tedana_py310 ]; then + conda create -yq -n tedana_py310 python=3.10 + source activate tedana_py310 + pip install .[tests] + fi + - run: + name: Running unit tests + command: | + source activate tedana_py310 + make unittest + mkdir /tmp/src/coverage + mv /tmp/src/tedana/.coverage /tmp/src/coverage/.coverage.py310 + - save_cache: + key: conda-py310-v1-{{ checksum "tedana/info.py" }} + paths: + - /opt/conda/envs/tedana_py310 + - persist_to_workspace: + root: /tmp + paths: + - src/coverage/.coverage.py310 + style_check: docker: - image: continuumio/miniconda3 @@ -318,12 +352,14 @@ workflows: - makeenv_37 - unittest_38 - unittest_39 + - unittest_310 - merge_coverage: requires: - unittest_36 - unittest_37 - unittest_38 - unittest_39 + - unittest_310 - three-echo - four-echo - five-echo diff --git a/tedana/info.py b/tedana/info.py index 62a25ebe9..68d36099c 100644 --- a/tedana/info.py +++ b/tedana/info.py @@ -79,4 +79,5 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ] From 4c40f1979a683b248b612cd0c8476dd50f326fc6 Mon Sep 17 00:00:00 2001 From: Joshua Teves Date: Thu, 18 Nov 2021 10:33:30 -0500 Subject: [PATCH 2/7] ? From 9783136e7a316899be81d7efd636f4ee8ae73b4f Mon Sep 17 00:00:00 2001 From: Joshua Teves Date: Thu, 17 Feb 2022 07:36:52 -0500 Subject: [PATCH 3/7] ? From 95b4d0cb35eb4668ab5df7d7b12a15501e5189e3 Mon Sep 17 00:00:00 2001 From: Joshua Teves Date: Wed, 16 Nov 2022 17:15:42 -0500 Subject: [PATCH 4/7] Add 3.11 --- .circleci/config.yml | 39 +++++++++++++++++++++++++++++++++++++-- setup.cfg | 1 + 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 97b163442..0a0d52cdd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,7 +159,7 @@ jobs: steps: - checkout - restore_cache: - key: conda-py310-v1-{{ checksum "tedana/info.py" }} + key: conda-py310-v1-{{ checksum "setup.cfg" }} - run: name: Generate environment command: | @@ -178,7 +178,7 @@ jobs: mkdir /tmp/src/coverage mv /tmp/src/tedana/.coverage /tmp/src/coverage/.coverage.py310 - save_cache: - key: conda-py310-v1-{{ checksum "tedana/info.py" }} + key: conda-py310-v1-{{ checksum "setup.cfg" }} paths: - /opt/conda/envs/tedana_py310 - persist_to_workspace: @@ -186,6 +186,41 @@ jobs: paths: - src/coverage/.coverage.py310 + unittest_311: + docker: + - image: continuumio/miniconda3 + working_directory: /tmp/src/tedana + steps: + - checkout + - restore_cache: + key: conda-py311-v1-{{ checksum "setup.cfg" }} + - run: + name: Generate environment + command: | + apt-get update + apt-get install -yqq make + if [ ! -d /opt/conda/envs/tedana_py311 ]; then + conda create -yq -n tedana_py310 python=3.11 + source activate tedana_py311 + pip install .[tests] + fi + - run: + name: Running unit tests + command: | + source activate tedana_py311 + make unittest + mkdir /tmp/src/coverage + mv /tmp/src/tedana/.coverage /tmp/src/coverage/.coverage.py311 + - save_cache: + key: conda-py311-v1-{{ checksum "setup.cfg" }} + paths: + - /opt/conda/envs/tedana_py311 + - persist_to_workspace: + root: /tmp + paths: + - src/coverage/.coverage.py311 + + style_check: docker: - image: continuumio/miniconda3 diff --git a/setup.cfg b/setup.cfg index ea9161b05..3d43e6ba6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,6 +19,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 [options] python_requires = >= 3.6 From cb9477497a801b7f4759532fddfb74d623a2dfe8 Mon Sep 17 00:00:00 2001 From: Joshua Teves Date: Wed, 16 Nov 2022 17:17:09 -0500 Subject: [PATCH 5/7] Actually add 3.11 --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a0d52cdd..9cef77ee8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -388,6 +388,7 @@ workflows: - unittest_38 - unittest_39 - unittest_310 + - unittest_311 - merge_coverage: requires: - unittest_36 From 3cc524aa2cc2900f3348dcdbd73cd24ca57828cb Mon Sep 17 00:00:00 2001 From: Joshua Teves Date: Wed, 16 Nov 2022 17:19:28 -0500 Subject: [PATCH 6/7] Remove 3.11 --- .circleci/config.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cef77ee8..650ff3788 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -186,40 +186,6 @@ jobs: paths: - src/coverage/.coverage.py310 - unittest_311: - docker: - - image: continuumio/miniconda3 - working_directory: /tmp/src/tedana - steps: - - checkout - - restore_cache: - key: conda-py311-v1-{{ checksum "setup.cfg" }} - - run: - name: Generate environment - command: | - apt-get update - apt-get install -yqq make - if [ ! -d /opt/conda/envs/tedana_py311 ]; then - conda create -yq -n tedana_py310 python=3.11 - source activate tedana_py311 - pip install .[tests] - fi - - run: - name: Running unit tests - command: | - source activate tedana_py311 - make unittest - mkdir /tmp/src/coverage - mv /tmp/src/tedana/.coverage /tmp/src/coverage/.coverage.py311 - - save_cache: - key: conda-py311-v1-{{ checksum "setup.cfg" }} - paths: - - /opt/conda/envs/tedana_py311 - - persist_to_workspace: - root: /tmp - paths: - - src/coverage/.coverage.py311 - style_check: docker: @@ -388,7 +354,6 @@ workflows: - unittest_38 - unittest_39 - unittest_310 - - unittest_311 - merge_coverage: requires: - unittest_36 From 11f3224170711dda73f68330dd535fecd736f03b Mon Sep 17 00:00:00 2001 From: Joshua Teves Date: Mon, 21 Nov 2022 09:37:50 -0500 Subject: [PATCH 7/7] Remove 3.11 --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 3d43e6ba6..ea9161b05 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,7 +19,6 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 [options] python_requires = >= 3.6