Merge branch 'release/2.7.0'

Author: wolph

.github/workflows/main.yml

@@ -0,0 +1,27 @@
+name: tox
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+    strategy:
+      matrix:
+        python-version: [2.7, 3.6, 3.7, 3.8, 3.9, '3.10']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox tox-gh-actions
+    - name: Test with tox
+      run: tox

python_utils/__about__.py

@@ -1,5 +1,5 @@
 __package_name__ = 'python-utils'
-__version__ = '2.6.3'
+__version__ = '2.7.0'
 __author__ = 'Rick van Hattem'
 __author_email__ = '[email protected]'
 __description__ = (

python_utils/converters.py

@@ -1,10 +1,13 @@
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 
+import decimal
+import math
 import re
+
 import six
-import math
-import decimal
 
 
 def to_int(input_, default=0, exception=(ValueError, TypeError), regexp=None):
@@ -263,22 +266,23 @@ def remap(value, old_min, old_max, new_min, new_max):
     >>> 0.1 + 0.1 + 0.1
     0.30000000000000004
 
-    If floating point remaps need to be done my suggstion is to pass at least one
-    parameter as a `decimal.Decimal`. This will ensure that the output from this
-    function is accurate. I left passing `floats` for backwards compatability and
-    there is no conversion done from float to `decimal.Decimal` unless one of the passed
-    parameters has a type of `decimal.Decimal`. This will ensure that any existing code
-    that uses this funtion will work exactly how it has in the past.
+    If floating point remaps need to be done my suggstion is to pass at least
+    one parameter as a `decimal.Decimal`. This will ensure that the output
+    from this function is accurate. I left passing `floats` for backwards
+    compatability and there is no conversion done from float to
+    `decimal.Decimal` unless one of the passed parameters has a type of
+    `decimal.Decimal`. This will ensure that any existing code that uses this
+    funtion will work exactly how it has in the past.
 
     Some edge cases to test
     >>> remap(1, 0, 0, 1, 2)
     Traceback (most recent call last):
-        ...
+    ...
     ValueError: Input range (0-0) is empty
 
     >>> remap(1, 1, 2, 0, 0)
     Traceback (most recent call last):
-        ...
+    ...
     ValueError: Output range (0-0) is empty
 
     :param value: value to be converted
@@ -310,19 +314,19 @@ def remap(value, old_min, old_max, new_min, new_max):
     '''
 
     if (
-        isinstance(value, decimal.Decimal) or
-        isinstance(old_min, decimal.Decimal) or
-        isinstance(old_max, decimal.Decimal) or
-        isinstance(new_min, decimal.Decimal) or
-        isinstance(new_max, decimal.Decimal)
+            isinstance(value, decimal.Decimal) or
+            isinstance(old_min, decimal.Decimal) or
+            isinstance(old_max, decimal.Decimal) or
+            isinstance(new_min, decimal.Decimal) or
+            isinstance(new_max, decimal.Decimal)
     ):
         type_ = decimal.Decimal
     elif (
-        isinstance(value, float) or
-        isinstance(old_min, float) or
-        isinstance(old_max, float) or
-        isinstance(new_min, float) or
-        isinstance(new_max, float)
+            isinstance(value, float) or
+            isinstance(old_min, float) or
+            isinstance(old_max, float) or
+            isinstance(new_min, float) or
+            isinstance(new_max, float)
     ):
         type_ = float
 

python_utils/time.py

@@ -163,7 +163,7 @@ def timeout_generator(
 
     if six.PY3:  # pragma: no cover
         timer = time.perf_counter
-    else:
+    else:  # pragma: no cover
         timer = time.time
 
     end = timeout + timer()

setup.py

@@ -35,6 +35,7 @@
         tests_require=['pytest'],
         extras_require={
             'docs': [
+                'six',
                 'mock',
                 'sphinx',
                 'python-utils',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, py37, py38, py39, pypy, flake8, docs
+envlist = py27, py35, py36, py37, py38, py39, py310, pypy, flake8, docs
 skip_missing_interpreters = True
 
 [testenv]
@@ -10,6 +10,7 @@ basepython =
     py37: python3.7
     py38: python3.8
     py39: python3.9
+    py310: python3.10
     pypy: pypy
 
 setenv = PY_IGNORE_IMPORTMISMATCH=1
@@ -19,7 +20,7 @@ commands = py.test --basetemp="{envtmpdir}" --confcutdir=.. {posargs} python_uti
 [testenv:flake8]
 basepython = python3
 deps = flake8
-commands = flake8 --ignore=W391 python_utils {posargs}
+commands = flake8 python_utils {posargs}
 
 [testenv:docs]
 basepython = python3