Skip to content

Commit 079a6a5

Browse files
committed
back to coveralls
1 parent daedd7f commit 079a6a5

File tree

4 files changed

+11
-40
lines changed

4 files changed

+11
-40
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ cache:
77
directories:
88
- $HOME/.cache/pip
99

10-
branches:
11-
only:
12-
- develop
13-
- master
14-
- feature/travis
15-
1610
services:
1711
- MySQL
1812
- PostgreSQL

README.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,15 @@ Links
6767
.. |master-build| image:: https://secure.travis-ci.org/saxix/django-concurrency.png?branch=master
6868
:target: http://travis-ci.org/saxix/django-concurrency/
6969

70-
.. |master-cov| image:: https://codecov.io/github/saxix/django-concurrency/coverage.svg?branch=master
71-
:target: https://codecov.io/github/saxix/django-concurrency?branch=master
70+
.. |master-cov| image:: https://coveralls.io/repos/saxix/django-concurrency/badge.svg?branch=master&service=github
71+
:target: https://coveralls.io/github/saxix/django-concurrency?branch=master
72+
7273

7374
.. |dev-build| image:: https://secure.travis-ci.org/saxix/django-concurrency.png?branch=develop
7475
:target: http://travis-ci.org/saxix/django-concurrency/
7576

76-
.. |dev-cov| image:: https://codecov.io/github/saxix/django-concurrency/coverage.svg?branch=develop
77-
:target: https://codecov.io/github/saxix/django-concurrency?branch=develop
77+
.. |dev-cov| image:: https://coveralls.io/repos/saxix/django-concurrency/badge.svg?branch=develop&service=github
78+
:target: https://coveralls.io/github/saxix/django-concurrency?branch=develop
7879

7980

8081
.. |wheel| image:: https://pypip.in/wheel/blackhole/badge.png

setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ max-complexity = 12
1818
max-line-length = 160
1919
exclude = .tox,migrations,.git,docs,diff_match_patch.py, deploy/**,settings
2020
ignore = E501,E401,W391,E128,E261,D
21+
22+
[aliases]
23+
test=pytest

setup.py

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,34 +45,6 @@ def run_tests(self):
4545
errno = pytest.main(self.test_args)
4646
sys.exit(errno)
4747

48-
49-
class Clean(CleanCommand):
50-
user_options = CleanCommand.user_options + [
51-
('build-coverage=', 'c',
52-
"build directory for coverage output (default: 'build.build-coverage')"),
53-
]
54-
55-
def initialize_options(self):
56-
self.build_coverage = None
57-
self.build_help = None
58-
CleanCommand.initialize_options(self)
59-
60-
def run(self):
61-
if self.all:
62-
for directory in (os.path.join(self.build_base, 'coverage'),
63-
os.path.join(self.build_base, 'help')):
64-
if os.path.exists(directory):
65-
remove_tree(directory, dry_run=self.dry_run)
66-
else:
67-
log.warn("'%s' does not exist -- can't clean it",
68-
directory)
69-
if self.build_coverage:
70-
remove_tree(self.build_coverage, dry_run=self.dry_run)
71-
if self.build_help:
72-
remove_tree(self.build_help, dry_run=self.dry_run)
73-
CleanCommand.run(self)
74-
75-
7648
setup(
7749
name=app.NAME,
7850
version=app.get_version(),
@@ -86,11 +58,12 @@ def run(self):
8658
long_description=open('README.rst').read(),
8759
license='MIT License',
8860
keywords='django',
61+
setup_requires=['pytest-runner',],
8962
install_requires=install_requires,
90-
tests_require=test_requires,
63+
tests_require='django\n' + test_requires,
9164
extras_require={'test': test_requires,
9265
'dev': test_requires + dev_requires},
93-
cmdclass={'test': PyTest},
66+
# cmdclass={'test': PyTest},
9467
classifiers=[
9568
'Development Status :: 5 - Production/Stable',
9669
'Environment :: Web Environment',

0 commit comments

Comments
 (0)