Skip to content

Commit fb44b4e

Browse files
authored
Migrate to py310 (#14)
* extend tests to py3.10 * try to import current module OR (for older py versions) from deprecated location * use pytest instead of nose * change flag * add classifiers for py3.9 and py3.10 * trigger tests for even more recent py versions * add classifiers * also test old py versions * Update qiita-plugin-ci.yml * Update qiita-plugin-ci.yml * Update qiita-plugin-ci.yml
1 parent 132ba26 commit fb44b4e

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

.github/workflows/qiita-plugin-ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ jobs:
99
# derived from https://github.com/actions/example-services/blob/master/.github/workflows/postgres-service.yml
1010
main:
1111
runs-on: ubuntu-latest
12-
12+
strategy:
13+
matrix:
14+
python-version: ["3.5", "3.6", "3.9", "3.10", "3.11", "3.12"]
1315
steps:
1416
# Downloads a copy of the code in your repository before running CI tests
1517
- name: Check out repository code
@@ -19,21 +21,21 @@ jobs:
1921
uses: conda-incubator/setup-miniconda@v2
2022
with:
2123
auto-update-conda: true
22-
python-version: 3.9
24+
python-version: ${{ matrix.python-version }}
2325

2426
- name: Basic dependencies install
2527
shell: bash -l {0}
2628
run: |
27-
conda create --yes -n qiita-files python=3.9 h5py pandas scipy numpy
29+
conda create --yes -n qiita-files python=${{ matrix.python-version }} h5py pandas scipy numpy
2830
conda activate qiita-files
2931
pip install .
30-
pip install sphinx sphinx-bootstrap-theme nose-timer codecov Click
32+
pip install sphinx sphinx-bootstrap-theme pytest-cov codecov Click
3133
3234
- name: Main tests
3335
shell: bash -l {0}
3436
run: |
3537
conda activate qiita-files
36-
nosetests --with-doctest --with-coverage --cover-package=qiita_files
38+
pytest --doctest-modules --cov=qiita_files `if (( $(echo "${{ matrix.python-version }} > 3.6" | bc -l) )); then echo "--cov-report=lcov"; else echo ""; fi`
3739
3840
lint:
3941
runs-on: ubuntu-latest

qiita_files/parse/workflow.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
from copy import deepcopy
1010
from time import time
1111
from functools import update_wrapper
12-
from collections import Iterable
12+
try:
13+
from collections.abc import Iterable
14+
except ImportError:
15+
from collections import Iterable
1316
from types import MethodType
1417

1518

setup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
Programming Language :: Python
2121
Programming Language :: Python :: 3.5
2222
Programming Language :: Python :: 3.6
23+
Programming Language :: Python :: 3.9
24+
Programming Language :: Python :: 3.10
25+
Programming Language :: Python :: 3.11
26+
Programming Language :: Python :: 3.12
2327
Programming Language :: Python :: Implementation :: CPython
2428
Operating System :: POSIX :: Linux
2529
Operating System :: MacOS :: MacOS X

0 commit comments

Comments
 (0)