diff --git a/.github/workflows/qiita-plugin-ci.yml b/.github/workflows/qiita-plugin-ci.yml index 7c2ed51..b88f397 100644 --- a/.github/workflows/qiita-plugin-ci.yml +++ b/.github/workflows/qiita-plugin-ci.yml @@ -9,7 +9,9 @@ jobs: # derived from https://github.com/actions/example-services/blob/master/.github/workflows/postgres-service.yml main: runs-on: ubuntu-latest - + strategy: + matrix: + python-version: ["3.5", "3.6", "3.9", "3.10", "3.11", "3.12"] steps: # Downloads a copy of the code in your repository before running CI tests - name: Check out repository code @@ -19,21 +21,21 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true - python-version: 3.9 + python-version: ${{ matrix.python-version }} - name: Basic dependencies install shell: bash -l {0} run: | - conda create --yes -n qiita-files python=3.9 h5py pandas scipy numpy + conda create --yes -n qiita-files python=${{ matrix.python-version }} h5py pandas scipy numpy conda activate qiita-files pip install . - pip install sphinx sphinx-bootstrap-theme nose-timer codecov Click + pip install sphinx sphinx-bootstrap-theme pytest-cov codecov Click - name: Main tests shell: bash -l {0} run: | conda activate qiita-files - nosetests --with-doctest --with-coverage --cover-package=qiita_files + pytest --doctest-modules --cov=qiita_files `if (( $(echo "${{ matrix.python-version }} > 3.6" | bc -l) )); then echo "--cov-report=lcov"; else echo ""; fi` lint: runs-on: ubuntu-latest diff --git a/qiita_files/parse/workflow.py b/qiita_files/parse/workflow.py index c1baf16..744e3c8 100644 --- a/qiita_files/parse/workflow.py +++ b/qiita_files/parse/workflow.py @@ -9,7 +9,10 @@ from copy import deepcopy from time import time from functools import update_wrapper -from collections import Iterable +try: + from collections.abc import Iterable +except ImportError: + from collections import Iterable from types import MethodType diff --git a/setup.py b/setup.py index 2f398e5..2580547 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,10 @@ Programming Language :: Python Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Programming Language :: Python :: Implementation :: CPython Operating System :: POSIX :: Linux Operating System :: MacOS :: MacOS X