Skip to content

Commit

Permalink
fix: setup.py test
Browse files Browse the repository at this point in the history
  • Loading branch information
lyschoening committed Jan 28, 2016
1 parent 137da3a commit aa99020
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ python:
- "3.4"
- "3.5"
install:
- "pip install ."
- "pip install ."
script: python setup.py test
8 changes: 4 additions & 4 deletions gnomic/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ def __init__(self, changes, parent=None, fusion_strategy=FUSION_MATCH_WHOLE):
added_fusion_features = set(parent.added_fusion_features if parent else ())
removed_fusion_features = set(parent.removed_fusion_features if parent else ())

def remove(features, remove, match_variant=True):
return {feature for feature in features if not remove.match(feature, match_variant)}
def remove(features, remove, **kwargs):
return {feature for feature in features if not remove.match(feature, **kwargs)}

def upsert(features, addition, match_variant=True):
return remove(features, addition, match_variant) | {addition}
def upsert(features, addition, **kwargs):
return remove(features, addition, **kwargs) | {addition}

# removes a feature, but only adds it to removed features if it isn't in added features.
def remove_or_exclude(added_features, removed_features, exclude):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
description='A grammar for describing microbial genotypes and phenotypes',
long_description=codecs.open('README.rst', encoding='utf-8').read(),
test_suite='nose.collector',
tests_require=[],
tests_require=['nose'],
install_requires=[
'grako>=3.6.6',
'six>=1.8.0'
Expand Down

0 comments on commit aa99020

Please sign in to comment.