diff --git a/.gitignore b/.gitignore index 7d9be156e0d68e4ff107b9ba3244a38be165a354..d2999d54c2388d74a53d3ccb46f2e3504d7df159 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.py[co] *.egg-info/ +*.egg cover/ .coverage output.xml diff --git a/Makefile b/Makefile index dd37a921b8c11e8a29e5c4460d02947c3cf08e43..8897b6df42fcc25d8d8e5633fae8db512cb37a8a 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ flake8: awk -F\: '{printf "%s:%s: [E]%s\n", $$1, $$2, $$3}' | tee flake8.log clonedigger: - clonedigger --cpd-output . + clonedigger --cpd-output aprs tests lint: pylint -f parseable -i y -r y aprs/*.py tests/*.py *.py | \ diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000000000000000000000000000000000000..fe220eecde08f8b0242171d858ab4b4af8f66c57 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,9 @@ +[nosetests] +with-xunit = 1 +with-coverage = 1 +cover-html = 1 +with-doctest = 1 +doctest-tests = 1 +cover-inclusive = 1 +cover-package = aprs +cover-tests = 1 diff --git a/setup.py b/setup.py index 19617844cade9b8e3e5d75d93858a9fe3a9781b7..1bb19bd515b3facf471a15d9ed7d25fbe2e742f9 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setuptools.setup( license='Creative Commons Attribution 3.0 Unported License', url='https://github.com/ampledata/aprs', setup_requires=['nose'], - tests_require=['nose', 'httpretty'], + tests_require=['coverage', 'httpretty', 'nose'], install_requires=['requests'] ) diff --git a/tests/test_aprs.py b/tests/test_aprs.py index 181dcc6d2d4dfc0c099d8356d328962c2459ff51..a569173d70931c868bace468f743d8ff19d084d9 100644 --- a/tests/test_aprs.py +++ b/tests/test_aprs.py @@ -13,6 +13,7 @@ from .context import aprs ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' NUMBERS = '0123456789' +POSITIVE_NUMBERS = NUMBERS[1:] ALPHANUM = ''.join([ALPHABET, NUMBERS]) @@ -28,7 +29,7 @@ class APRSTest(unittest.TestCase): def setUp(self): self.fake_server = ''.join([ 'http://localhost:', - self.random(4, '123456789'), + self.random(4, POSITIVE_NUMBERS), '/' ]) @@ -37,7 +38,7 @@ class APRSTest(unittest.TestCase): self.random(1, NUMBERS), self.random(3, ALPHABET), '-', - self.random(1, '123456789') + self.random(1, POSITIVE_NUMBERS) ]) self.real_server = 'http://localhost:14580'