tests: use pytest <= nose

Author: casperdcl

.gitignore

@@ -7,11 +7,11 @@ __pycache__/
 /*.egg*/
 /build/
 /dist/
-/git-fame_*_amd64.snap
+/git-fame_*.snap
 /.dockerignore
 
 # Unit test / coverage reports
 /.tox/
 /.coverage*
 /coverage.xml
-nosetests.xml
+/.pytest_cache/

.pre-commit-config.yaml

@@ -25,15 +25,15 @@ repos:
     args: [-i]
     types: [text]
     exclude: ^(.pre-commit-config.yaml|.github/workflows/test.yml)$
-  - id: nose
+  - id: pytest
     name: Run tests
     language: python
-    entry: nosetests
-    args: ['-d', tests/]
+    entry: pytest
+    args: [-qq, --durations=1]
     types: [python]
     pass_filenames: false
     additional_dependencies:
-    - nose
+    - pytest-timeout
     - argopt
     - tabulate
     - tqdm

Makefile

@@ -8,7 +8,7 @@
 	all
 	flake8
 	test
-	testnose
+	pytest
 	testsetup
 	testcoverage
 	testtimer
@@ -17,7 +17,7 @@
 	prebuildclean
 	clean
 	toxclean
-	installdev
+	install_dev
 	install
 	build
 	buildupload
@@ -41,13 +41,13 @@ all:
 	@+make build
 
 flake8:
-	@+flake8 -j 8 --count --statistics --exit-zero .
+	@+pre-commit run -a flake8
 
 test:
 	tox --skip-missing-interpreters -p all
 
-testnose:
-	nosetests gitfame -d -v
+pytest:
+	pytest
 
 testsetup:
 	@make gitfame/git-fame.1
@@ -56,10 +56,10 @@ testsetup:
 
 testcoverage:
 	@make coverclean
-	nosetests gitfame --with-coverage --cover-package=gitfame --cover-erase --cover-min-percentage=80 -d -v
+	pytest --cov=gitfame --cov-report=xml --cov-report=term --cov-fail-under=80
 
 testtimer:
-	nosetests gitfame --with-timer -d -v
+	pytest
 
 gitfame/git-fame.1: .meta/.git-fame.1.md gitfame/_gitfame.py
 	python -c 'import gitfame; print(gitfame._gitfame.__doc__.rstrip())' |\
@@ -86,8 +86,9 @@ prebuildclean:
 	@+python -c "import os; os.remove('gitfame/_dist_ver.py') if os.path.exists('gitfame/_dist_ver.py') else None"
 coverclean:
 	@+python -c "import os; os.remove('.coverage') if os.path.exists('.coverage') else None"
-	@+python -c "import shutil; shutil.rmtree('gitfame/__pycache__', True)"
+	@+python -c "import os, glob; [os.remove(i) for i in glob.glob('.coverage.*')]"
 	@+python -c "import shutil; shutil.rmtree('tests/__pycache__', True)"
+	@+python -c "import shutil; shutil.rmtree('gitfame/__pycache__', True)"
 clean:
 	@+python -c "import os, glob; [os.remove(i) for i in glob.glob('*.py[co]')]"
 	@+python -c "import os, glob; [os.remove(i) for i in glob.glob('gitfame/*.py[co]')]"
@@ -97,13 +98,13 @@ clean:
 toxclean:
 	@+python -c "import shutil; shutil.rmtree('.tox', True)"
 
-
-installdev:
-	python setup.py develop --uninstall
-	python setup.py develop
-
 install:
 	python setup.py install
+install_dev:
+	python setup.py develop --uninstall
+	python setup.py develop
+install_build:
+	python -m pip install -r .meta/requirements-build.txt
 
 build:
 	@make prebuildclean

gitfame/_gitfame.py

@@ -316,7 +316,7 @@ def stats_append(fname, auth, loc, tstamp):
         try:
           inss, dels, fname = i.split('\t')
         except ValueError:
-            log.warn(i)
+            log.warning(i)
         else:
           fname = RE_RENAME.sub(r'\\2', fname)
           loc = (
@@ -366,7 +366,7 @@ def run(args):
   log.debug("parsing args")
 
   if args.sort not in "loc commits files hours months".split():
-    log.warn("--sort argument (%s) unrecognised\n%s" % (
+    log.warning("--sort argument (%s) unrecognised\n%s" % (
         args.sort, __doc__))
     raise KeyError(args.sort)
 
@@ -430,8 +430,8 @@ def run(args):
       churn = CHURN_SLOC
 
   if churn & (CHURN_INS | CHURN_DEL) and args.excl:
-      log.warn("--loc=ins,del includes historical files"
-               " which may need to be added to --excl")
+      log.warning("--loc=ins,del includes historical files"
+                  " which may need to be added to --excl")
 
   auth_stats = {}
   statter = partial(

setup.cfg

@@ -73,9 +73,9 @@ classifiers=
     Topic :: Utilities
 [options]
 setup_requires=setuptools>=42; setuptools_scm[toml]>=3.4
-install_requires=argopt>=0.3.5; setuptools; tabulate; tqdm>=4.44.0
 python_requires=>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
-tests_require=nose; flake8; coverage
+install_requires=argopt>=0.3.5; setuptools; tabulate; tqdm>=4.44.0
+tests_require=tox
 include_package_data=True
 packages=find:
 [options.extras_require]
@@ -112,6 +112,13 @@ line_length=99
 multi_line_output=4
 known_first_party=gitfame,tests
 
+[tool:pytest]
+timeout=30
+log_level=INFO
+python_files=tests_*.py
+testpaths=tests
+addopts=-v --tb=short -rxs -W=error --durations=0 --durations-min=0.1
+
 [coverage:run]
 branch=True
 omit=

setup.py

@@ -23,4 +23,4 @@
     except ImportError:
         pass
 
-setup(use_scm_version=True, test_suite='nose.collector', ext_modules=ext_modules)
+setup(use_scm_version=True, ext_modules=ext_modules)

tests/__init__.py

@@ -7,12 +7,9 @@
 from tempfile import mkdtemp
 from textwrap import dedent
 
-# import re
-# from nose import with_setup
-from nose.plugins.skip import SkipTest
+from pytest import skip
 
 from gitfame import _gitfame, main
-# from io import IOBase  # to support unicode strings
 from gitfame._utils import StringIO
 
 # test data
@@ -110,8 +107,8 @@ def test_tabulate_yaml():
       total: {commits: 35, files: 14, loc: 613}""")]
   try:
     assert (_gitfame.tabulate(auth_stats, stats_tot, backend='yaml') in res)
-  except ImportError:
-    raise SkipTest
+  except ImportError as err:
+    raise skip(str(err))
 
 
 def test_tabulate_json():
@@ -144,8 +141,8 @@ def test_tabulate_tabulate():
       --------------------  -----  ------  ------  ---------------
       Casper da Costa-Luis    538      35      10  87.8/ 100/71.4
       Not Committed Yet        75       0       4  12.2/ 0.0/28.6"""))
-  except ImportError:
-    raise SkipTest
+  except ImportError as err:
+    raise skip(str(err))
 
 
 def test_tabulate_enum():
@@ -174,9 +171,12 @@ def test_main():
   from os.path import dirname as dn
 
   res = subprocess.Popen(
-      (sys.executable, '-c', 'import gitfame; import sys;\
-       sys.argv = ["", "--silent-progress", "%s"];\
-       gitfame.main()' % dn(dn(__file__))),
+      (sys.executable, '-c', dedent('''\
+      import gitfame
+      import sys
+      sys.argv = ["", "--silent-progress", "''' + dn(dn(__file__)) + '''"]
+      gitfame.main()
+      ''')),
       stdout=subprocess.PIPE,
       stderr=subprocess.STDOUT).communicate()[0]
 

tests/tests_gitfame.py

@@ -23,23 +23,28 @@ python=
 
 [core]
 deps=
-    nose
-    nose-timer
+    pytest
+    py3{5,6}: pytest<7
+    pytest-cov
+    pytest-timeout
     coverage
     coveralls
     codecov
+commands=
+    - coveralls
+    codecov -X pycov -e TOXENV
 
 [testenv]
-passenv=TOXENV CI GITHUB_* CODECOV_* COVERALLS_*
+passenv=TOXENV CI GITHUB_* CODECOV_* COVERALLS_* HOME
 deps=
     {[core]deps}
     tqdm
     pyyaml
 commands=
-    nosetests --with-coverage --with-timer --cover-package=gitfame -d -v tests/
-    coverage xml
-    - coveralls
-    codecov -X pycov -e TOXENV
+    py{27,py2}: pytest --cov=argopt --cov-report=xml --cov-report=term -o addopts= -v --tb=short -rxs -W=error --durations=10
+    py3{5,6}: pytest --cov=argopt --cov-report=xml --cov-report=term -o addopts= -v --tb=short -rxs -W=error --durations=0 --durations-min=0.1
+    py3{7,8,9,10,11}: pytest --cov=argopt --cov-report=xml --cov-report=term
+    {[core]commands}
 
 [testenv:setup.py]
 deps=