Skip to content

Commit

Permalink
Fix circular import
Browse files Browse the repository at this point in the history
Signed-off-by: Zack Cerza <[email protected]>
  • Loading branch information
zmc committed Oct 5, 2020
1 parent 736c832 commit 96ef781
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
CHANGES
=======

v0.3.1
------

* Fix circular import

v0.3.0
------

* Update ChangeLog for v0.3.0
* .github: Publish package on release creation
* .github: Upload coverage reports to codecov
* .github: Run CI on push to master
Expand Down
4 changes: 2 additions & 2 deletions must_triage/cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import sys
import yaml

from must_triage import formatters
from must_triage import inspectors
import must_triage.formatters as formatters
import must_triage.inspectors as inspectors


def parse_args(args):
Expand Down
3 changes: 2 additions & 1 deletion must_triage/inspectors/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from . import ocp, ocs
import must_triage.inspectors.ocp as ocp
import must_triage.inspectors.ocs as ocs


def merge_interests(existing, new):
Expand Down
5 changes: 2 additions & 3 deletions must_triage/inspectors/ocp.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import yaml

import must_triage.fs as fs
import must_triage.inspectors.base as base

from must_triage.inspectors.base import Inspector


class OCP(Inspector):
class OCP(base.Inspector):
gather_types = dict(
yaml=dict(
match=lambda p: fs.has_ext(p, ['yaml', 'yml']),
Expand Down
5 changes: 2 additions & 3 deletions must_triage/inspectors/ocs.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
import re

import must_triage.fs as fs
import must_triage.inspectors.base as base

from must_triage.inspectors.base import Inspector


class OCS(Inspector):
class OCS(base.Inspector):
gather_types = dict(
json=dict(
match=lambda p: re.match('.*--format_json(-pretty)?$', p),
Expand Down

0 comments on commit 96ef781

Please sign in to comment.