Skip to content

Commit

Permalink
Merge bb27bb5 into d0c7380
Browse files Browse the repository at this point in the history
  • Loading branch information
lnielsen committed Aug 6, 2014
2 parents d0c7380 + bb27bb5 commit b33c2a5
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[run]
source = dictdiffer
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"

install:
- pip install --upgrade pip --use-mirrors
- pip install coveralls --use-mirrors
- pip install .

script:
- python tests.py
- coverage run --source=dictdiffer tests.py

after_success:
- coveralls

notifications:
email: false
21 changes: 11 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from distutils.core import setup
from setuptools import setup

setup(name='dictdiffer',
version='0.0.3',
description='Dictdiffer is a helper module that helps you '
'to diff and patch dictionaries',
author='Fatih Erikli',
author_email='fatiherikli@gmail.com',
url='https://github.com/fatiherikli/dictdiffer',
py_modules=['dictdiffer'],
)
setup(
name='dictdiffer',
version='0.0.5',
description='Dictdiffer is a helper module that helps you '
'to diff and patch dictionaries',
author='Fatih Erikli',
author_email='info@invenio-software.org',
url='https://github.com/inveniosoftware/dictdiffer',
py_modules=['dictdiffer'],
)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py26, py27, py33
envlist = py26, py27, py33, py34

[testenv]
commands = {envpython} tests.py

0 comments on commit b33c2a5

Please sign in to comment.