Remove dead python 2 code and update some tests.

Author: ionelmc

.pre-commit-config.yaml

@@ -5,16 +5,16 @@
 exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: master
+    rev: v4.3.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: debug-statements
   - repo: https://github.com/timothycrosley/isort
-    rev: master
+    rev: 5.10.1
     hooks:
       - id: isort
   - repo: https://gitlab.com/pycqa/flake8
-    rev: master
+    rev: 3.9.2
     hooks:
       - id: flake8

CHANGELOG.rst

@@ -2,17 +2,16 @@
 Changelog
 =========
 
-3.4.3 (????-??-??)
+4.0.0 (2022-10-25)
 ------------------
+
+* Dropped support for legacy Pythons (2.7, 3.6 or older).
+* Switched CI to GitHub Actions.
 * Fix skipping test in `test_utils.py` if appropriate VCS not available. Also fix typo.
   Contributed by Sam James in `#211 <https://github.com/ionelmc/pytest-benchmark/pull/211>`_.
 * Use ``pytest.hookimpl`` and ``pytest.hookspec`` to configure hooks,
   avoiding a deprecation warning in the upcoming pytest 7.2.0.
   Contributed by Florian Bruhin in `#224 <https://github.com/ionelmc/pytest-benchmark/pull/224>`_.
-
-3.4.2 (2021-06-15)
-------------------
-
 * Don't save if ``--benchmark-disable`` is used.
   Fixes `#205 <https://github.com/ionelmc/pytest-benchmark/issues/205`_.
   Contributed by Friedrich Delgado in `#207 <https://github.com/ionelmc/pytest-benchmark/pull/207>`_.
@@ -169,7 +168,7 @@ Changelog
 * Added a command line tool to compare previous data: ``py.test-benchmark``. It has two commands:
 
   * ``list`` - Lists all the available files.
-  * ``compare`` - Displays result tables. Takes optional arguments:
+  * ``compare`` - Displays result tables. Takes options:
 
     * ``--sort=COL``
     * ``--group-by=LABEL``

docs/index.rst

@@ -87,4 +87,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

docs/usage.rst

@@ -193,7 +193,7 @@ The compare ``command`` takes almost all the ``--benchmark`` options, minus the
       glob_or_file          Glob or exact path for json files. If not specified
                             all runs are loaded.
 
-    optional arguments:
+    options:
       -h, --help            show this help message and exit
       --sort=COL            Column to sort on. Can be one of: 'min', 'max',
                             'mean', 'stddev', 'name', 'fullname'. Default: 'min'

src/pytest_benchmark/compat.py

@@ -1,47 +1,3 @@
 import sys
 
-try:
-    from collections.abc import Iterable
-except ImportError:
-    from collections import Iterable  # noqa
-
-PY3 = sys.version_info[0] == 3
-PY38 = PY3 and sys.version_info[1] >= 8
-
-XRANGE = range if PY3 else xrange  # noqa
-INT = (int,) if PY3 else (int, long)  # noqa
-
-if PY3:
-    import builtins
-    exec_ = getattr(builtins, "exec")
-
-    def reraise(tp, value, tb=None):
-        try:
-            if value is None:
-                value = tp()
-            if value.__traceback__ is not tb:
-                raise value.with_traceback(tb)
-            raise value
-        finally:
-            value = None
-            tb = None
-
-else:
-    def exec_(_code_, _globs_=None, _locs_=None):
-        """Execute code in a namespace."""
-        if _globs_ is None:
-            frame = sys._getframe(1)
-            _globs_ = frame.f_globals
-            if _locs_ is None:
-                _locs_ = frame.f_locals
-            del frame
-        elif _locs_ is None:
-            _locs_ = _globs_
-        exec("""exec _code_ in _globs_, _locs_""")
-
-    exec_("""def reraise(tp, value, tb=None):
-    try:
-        raise tp, value, tb
-    finally:
-        tb = None
-""")
+PY38 = sys.version_info[0] == 3 and sys.version_info[1] >= 8

src/pytest_benchmark/fixture.py

@@ -9,8 +9,6 @@
 import traceback
 from math import ceil
 
-from .compat import INT
-from .compat import XRANGE
 from .timers import compute_timer_precision
 from .utils import NameWrapper
 from .utils import format_time
@@ -160,9 +158,9 @@ def _raw(self, function_to_benchmark, *args, **kwargs):
             if self._warmup:
                 warmup_rounds = min(rounds, max(1, int(self._warmup / iterations)))
                 self._logger.debug("  Warmup %s rounds x %s iterations ..." % (warmup_rounds, iterations))
-                for _ in XRANGE(warmup_rounds):
+                for _ in range(warmup_rounds):
                     runner(loops_range)
-            for _ in XRANGE(rounds):
+            for _ in range(rounds):
                 stats.update(runner(loops_range))
             self._logger.debug("  Ran for %ss." % format_time(time.time() - run_start), yellow=True, bold=True)
         if self.enabled and self.cprofile:
@@ -179,13 +177,13 @@ def _raw_pedantic(self, target, args=(), kwargs=None, setup=None, rounds=1, warm
 
         has_args = bool(args or kwargs)
 
-        if not isinstance(iterations, INT) or iterations < 1:
+        if not isinstance(iterations, int) or iterations < 1:
             raise ValueError("Must have positive int for `iterations`.")
 
-        if not isinstance(rounds, INT) or rounds < 1:
+        if not isinstance(rounds, int) or rounds < 1:
             raise ValueError("Must have positive int for `rounds`.")
 
-        if not isinstance(warmup_rounds, INT) or warmup_rounds < 0:
+        if not isinstance(warmup_rounds, int) or warmup_rounds < 0:
             raise ValueError("Must have positive int for `warmup_rounds`.")
 
         if iterations > 1 and setup:
@@ -205,14 +203,14 @@ def make_arguments(args=args, kwargs=kwargs):
             return target(*args, **kwargs)
 
         stats = self._make_stats(iterations)
-        loops_range = XRANGE(iterations) if iterations > 1 else None
-        for _ in XRANGE(warmup_rounds):
+        loops_range = range(iterations) if iterations > 1 else None
+        for _ in range(warmup_rounds):
             args, kwargs = make_arguments()
 
             runner = self._make_runner(target, args, kwargs)
             runner(loops_range)
 
-        for _ in XRANGE(rounds):
+        for _ in range(rounds):
             args, kwargs = make_arguments()
 
             runner = self._make_runner(target, args, kwargs)
@@ -273,7 +271,7 @@ def _calibrate_timer(self, runner):
 
         loops = 1
         while True:
-            loops_range = XRANGE(loops)
+            loops_range = range(loops)
             duration = runner(loops_range)
             if self._warmup:
                 warmup_start = time.time()
@@ -299,7 +297,7 @@ def _calibrate_timer(self, runner):
                 if loops == 1:
                     # If we got a single loop then bail early - nothing to calibrate if the the
                     # test function is 100 times slower than the timer resolution.
-                    loops_range = XRANGE(loops)
+                    loops_range = range(loops)
                     break
             else:
                 loops *= 10

src/pytest_benchmark/histogram.py

@@ -1,6 +1,7 @@
+from collections.abc import Iterable
+
 import py
 
-from .compat import Iterable
 from .utils import TIME_UNITS
 from .utils import slugify
 

src/pytest_benchmark/hookspec.py

@@ -1,5 +1,6 @@
 import pytest
 
+
 @pytest.hookspec(firstresult=True)
 def pytest_benchmark_scale_unit(config, unit, benchmarks, best, worst, sort):
     """