Merge pull request #8 from ekonstantinidis/project-uptodate

Bring project up to date

Author: ekonstantinidis

.gitignore

@@ -13,6 +13,7 @@ lib/
 lib64/
 parts/
 sdist/
+.tox/
 var/
 *.egg-info/
 .installed.cfg

.travis.yml

@@ -2,16 +2,24 @@ language: python
 
 sudo: false
 
-python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
+env:
+  - TOX_ENV=py27
+  - TOX_ENV=py34
+
+matrix:
+  fast_finish: true
+
+before_install:
+  - pip install codecov
 
 install:
-  - pip install -r requirements.txt
+  - pip install tox
 
 script:
-  - python runtests.py
+  - tox -e $TOX_ENV
+
+after_success:
+  - codecov
 
 notifications:
   slack:

README.md

@@ -1,4 +1,4 @@
-# pypiup [![travis][travis-image]][travis-url] [![pypi][pypi-image]][pypi-url]
+# pypiup [![travis][travis-image]][travis-url] [![codecov][codecov-image]][codecov-url] [![pypi][pypi-image]][pypi-url]
 Check whether your PyPI requirements are up to date.
 
 [![press][press-image]][press-url]
@@ -55,6 +55,9 @@ In order to run the tests you will have to run:
 [travis-image]: https://travis-ci.org/ekonstantinidis/pypiup.svg?branch=master
 [travis-url]: https://travis-ci.org/ekonstantinidis/pypiup
 
+[codecov-image]: https://codecov.io/github/ekonstantinidis/pypiup/coverage.svg?branch=master
+[codecov-url]: https://codecov.io/github/ekonstantinidis/pypiup?branch=master
+
 [pypi-image]: https://badge.fury.io/py/pypiup.svg
 [pypi-url]: https://pypi.python.org/pypi/pypiup/
 

requirements.txt

@@ -1,6 +1,7 @@
 click==6.4
 flake8==2.5.4
-coverage==4.0.3
+nose2==0.6.4
+cov-core==1.15.0
 requests==2.9.1
 httpretty==0.8.14
 semantic-version==2.5.0

requirements/requirements-demo.txt

@@ -1,9 +1,9 @@
-Django==1.9.4
-click==6.3
-djangorestframework==3.3.3
+Django==1.7.1
+click==6.1
+djangorestframework==3.3.2
 django-crispy-forms==1.4.0
-drfdocs==0.0.9
-apscheduler==3.0.5
+drfdocs==0.0.5
+apscheduler==3.0.3
 
 # commented-package==1.2.3
 testing-errors-abc==0.0.12

runtests.py

@@ -4,7 +4,13 @@
 
 
 FLAKE8_ARGS = ['pypiup/', 'tests/', '--ignore=E501']
-COVERAGE_ARGS = ['--source=pypiup', '--omit=pypiup/__init__.py', 'python -m unittest -v tests/tests.py']
+NOSE2_ARGS = [
+    '--with-coverage',
+    '--coverage', 'pypiup',
+    '--coverage-report', 'term-missing',
+    '--coverage-report', 'html',
+    '--verbose'
+]
 
 
 def exit_on_failure(command, message=None):
@@ -13,16 +19,16 @@ def exit_on_failure(command, message=None):
 
 
 def flake8_main(args):
-    print('Running: flake8', FLAKE8_ARGS)
+    print('Running: flake8 %s' % FLAKE8_ARGS)
     command = subprocess.call(['flake8'] + args)
-    print("" if command else "Success. flake8 passed.")
+    print("" if command else "Success. flake8 passed.\n")
     return command
 
 
-def run_tests_coverage(args):
-    command = subprocess.call('coverage run --source=pypiup --omit=pypiup/__init__.py -m unittest tests.tests_cli', shell=True)
-    command = subprocess.call(['coverage', 'report'])
+def run_tests(args):
+    print('Running: nose2 -v %s' % " ".join(args))
+    command = subprocess.call(['nose2'] + args)
     return command
 
 exit_on_failure(flake8_main(FLAKE8_ARGS))
-exit_on_failure(run_tests_coverage(COVERAGE_ARGS))
+exit_on_failure(run_tests(NOSE2_ARGS))

tests/tests_cli.py tests/test_cli.pytests/tests_cli.py renamed to tests/test_cli.py

@@ -75,6 +75,3 @@ def test_cli_file_not_found(self):
 
         self.assertEqual(result.exit_code, 0)
         self.assertIn("Could not find requirements-fake.txt. No such file or directory.", result.output)
-
-if __name__ == '__main__':
-    unittest.main()

tox.ini

@@ -0,0 +1,10 @@
+[tox]
+envlist = py27,py34
+
+[testenv]
+setenv =
+    PYTHONDONTWRITEBYTECODE = 1
+deps =
+    -rrequirements.txt
+commands =
+    python runtests.py