Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds the working version of the code #2

Merged
merged 1 commit into from
Sep 2, 2015
Merged

Adds the working version of the code #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
graft docs
graft examples
graft src
graft absorbing_centrality
graft ci
graft tests

Expand Down
0 src/absorbing_centrality/__init__.py → ...ntrality/absorbing_centrality/__init__.py
View file
Open in desktop
File renamed without changes.
9 changes: 6 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ def read(*names, **kwargs):
author='Charalampos Mavroforakis',
author_email='cmav@bu.edu',
url='https://github.com/harrymvr/absorbing-centrality',
packages=find_packages('src'),
package_dir={'': 'src'},
py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')],
packages=find_packages('absorbing_centrality'),
package_dir={'': 'absorbing_centrality'},
py_modules=[splitext(basename(path))[0] for path in glob('absorbing_centrality/*.py')],
include_package_data=True,
zip_safe=False,
classifiers=[
Expand All @@ -59,6 +59,9 @@ def read(*names, **kwargs):
],
install_requires=[
# eg: 'aspectlib==1.1.1', 'six>=1.7',
'networkx==1.9.1',
'numpy>=1.9.2',
'scipy>=0.16'
],
extras_require={
# eg:
Expand Down
52 changes: 5 additions & 47 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ deps =
pytest
pytest-capturelog
pytest-cov

networkx==1.9.1
numpy==1.9.2
scipy==0.16
commands =
{posargs:py.test --cov --cov-report=term-missing -vv}
usedevelop = true
Expand Down Expand Up @@ -62,7 +66,7 @@ usedevelop = false
commands =
python setup.py check --strict --metadata --restructuredtext
check-manifest {toxinidir}
flake8 src tests
flake8 absorbing_centrality tests

[testenv:coveralls]
deps =
Expand All @@ -74,55 +78,9 @@ commands =
coverage report
coveralls []

[testenv:codecov]
deps =
codecov
skip_install = true
usedevelop = false
commands =
coverage combine
coverage report
coverage xml --ignore-errors
codecov []


[testenv:report]
basepython = python3.4
deps = coverage
skip_install = true
usedevelop = false
commands =
coverage combine
coverage report

[testenv:clean]
commands = coverage erase
skip_install = true
usedevelop = false
deps = coverage

[testenv:2.6-nocover]
commands =
{posargs:py.test -vv --ignore=src}
usedevelop = false

[testenv:2.7-nocover]
commands =
{posargs:py.test -vv --ignore=src}
usedevelop = false

[testenv:3.3-nocover]
commands =
{posargs:py.test -vv --ignore=src}
usedevelop = false

[testenv:3.4-nocover]
commands =
{posargs:py.test -vv --ignore=src}
usedevelop = false

[testenv:pypy-nocover]
commands =
{posargs:py.test -vv --ignore=src}
usedevelop = false