Skip to content

Commit

Permalink
Merge pull request #54 from NCI-GDC/feat/fix-import
Browse files Browse the repository at this point in the history
Update depreciated import for py3.10
  • Loading branch information
czyszCTDS authored Jul 27, 2022
2 parents 0b0d9ec + 015403a commit a47f0ae
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ release:
.python_versions:
parallel:
matrix:
- REPO_PY_VERSION: [python3.8]
- REPO_PY_VERSION: [python3.8, python3.10]

docker_build:
rules:
Expand Down
3 changes: 2 additions & 1 deletion maflib/header.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"""

import logging
from collections import MutableMapping, OrderedDict
from collections import OrderedDict
from collections.abc import MutableMapping
from copy import deepcopy
from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional, Tuple, Union

Expand Down
2 changes: 1 addition & 1 deletion maflib/record.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""

import logging
from collections import MutableMapping
from collections.abc import MutableMapping
from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional, Union

from maflib.column import MafColumnRecord
Expand Down
13 changes: 5 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ skip_install =
false
install_command = python -m pip install {opts} {packages}
deps =
-rdev-requirements.txt
-rrequirements.txt
pytest
commands = pytest -vv {posargs}

[testenv:dev]
Expand All @@ -40,8 +39,8 @@ commands =
[testenv:cov]
skip_install=True
deps =
-rdev-requirements.txt
-rrequirements.txt
coverage
pytest
commands =
coverage run -m pytest tests/
coverage combine
Expand All @@ -52,16 +51,14 @@ commands =
[testenv:flake8]
skip_install=True
deps =
-rdev-requirements.txt
-rrequirements.txt
flake8
commands =
flake8 {env:package}/ tests/

[testenv:type]
skip_install = false
deps=
-rrequirements.txt
-rdev-requirements.txt
mypy
commands =
python -m mypy {env:package}/

Expand Down

0 comments on commit a47f0ae

Please sign in to comment.