Merge pull request #54 from jaraco/bugfix/52-deprecations

Limit reliance on manage.py and nose

dev-requirements.txt

@@ -8,6 +8,7 @@ nose>=1.3.7,<2.0.0
 manage.py>=0.2.10,<0.3.0
 pkutils>=3.0.0,<4.0.0
 pylint>=2.5.0,<3.0.0
+pytest>=8,<9
 responses>=0.9.0,<0.15.0
 setuptools>=42.0.2
 tox>=3.14.3,<4.0.0

tests/test_fntools.py

@@ -6,14 +6,15 @@
 
 Provides main unit tests.
 """
-import nose.tools as nt
 import itertools as it
 import requests
 import responses
 
 from io import StringIO
 from operator import itemgetter
 
+import pytest
+
 from meza import fntools as ft, io, stats
 
 
@@ -26,77 +27,77 @@ def setup_module():
 
 class TestIterStringIO:
     def test_strip(self):
-        nt.assert_equal("2123.45", ft.strip("2,123.45"))
+        assert "2123.45" == ft.strip("2,123.45")
 
         parsed = ft.strip("2.123,45", thousand_sep=".", decimal_sep=",")
-        nt.assert_equal("2123.45", parsed)
-        nt.assert_equal("spam", ft.strip("spam"))
+        assert "2123.45" == parsed
+        assert "spam" == ft.strip("spam")
 
     def test_is_numeric(self):
-        nt.assert_true(ft.is_numeric("2,123.45"))
-        nt.assert_true(ft.is_numeric("2.123,45"))
-        nt.assert_true(ft.is_numeric("0.45"))
-        nt.assert_true(ft.is_numeric(1))
-        nt.assert_true(ft.is_numeric("10e5"))
-        nt.assert_false(ft.is_numeric("spam"))
-        nt.assert_false(ft.is_numeric("02139"))
-        nt.assert_true(ft.is_numeric("02139", strip_zeros=True))
-        nt.assert_false(ft.is_numeric("spam"))
-        nt.assert_false(ft.is_numeric(None))
-        nt.assert_false(ft.is_numeric(""))
+        assert ft.is_numeric("2,123.45")
+        assert ft.is_numeric("2.123,45")
+        assert ft.is_numeric("0.45")
+        assert ft.is_numeric(1)
+        assert ft.is_numeric("10e5")
+        assert not ft.is_numeric("spam")
+        assert not ft.is_numeric("02139")
+        assert ft.is_numeric("02139", strip_zeros=True)
+        assert not ft.is_numeric("spam")
+        assert not ft.is_numeric(None)
+        assert not ft.is_numeric("")
 
     def test_is_numeric_currency_zero_value(self):
         """Regression test for https://github.com/reubano/meza/issues/36"""
         for sym in ft.CURRENCIES:
-            nt.assert_true(ft.is_numeric(f"0{sym}"))
-            nt.assert_true(ft.is_numeric(f"{sym}0"))
+            assert ft.is_numeric(f"0{sym}")
+            assert ft.is_numeric(f"{sym}0")
 
     def test_is_int(self):
-        nt.assert_false(ft.is_int("5/4/82"))
+        assert not ft.is_int("5/4/82")
 
     def test_is_bool(self):
-        nt.assert_true(ft.is_bool("y"))
-        nt.assert_true(ft.is_bool(1))
-        nt.assert_true(ft.is_bool(False))
-        nt.assert_true(ft.is_bool("false"))
-        nt.assert_true(ft.is_bool("n"))
-        nt.assert_true(ft.is_bool(0))
-        nt.assert_false(ft.is_bool(""))
-        nt.assert_false(ft.is_bool(None))
+        assert ft.is_bool("y")
+        assert ft.is_bool(1)
+        assert ft.is_bool(False)
+        assert ft.is_bool("false")
+        assert ft.is_bool("n")
+        assert ft.is_bool(0)
+        assert not ft.is_bool("")
+        assert not ft.is_bool(None)
 
     def test_is_null(self):
-        nt.assert_false(ft.is_null(""))
-        nt.assert_false(ft.is_null(" "))
-        nt.assert_false(ft.is_null(False))
-        nt.assert_false(ft.is_null("0"))
-        nt.assert_false(ft.is_null(0))
-        nt.assert_true(ft.is_null("", blanks_as_nulls=True))
-        nt.assert_true(ft.is_null(" ", blanks_as_nulls=True))
+        assert not ft.is_null("")
+        assert not ft.is_null(" ")
+        assert not ft.is_null(False)
+        assert not ft.is_null("0")
+        assert not ft.is_null(0)
+        assert ft.is_null("", blanks_as_nulls=True)
+        assert ft.is_null(" ", blanks_as_nulls=True)
 
     def test_byte_array(self):
         content = "Iñtërnâtiônàližætiøn"
         expected = bytearray("Iñtërnâtiônàližætiøn".encode("utf-8"))
-        nt.assert_equal(expected, ft.byte(content))
-        nt.assert_equal(expected, ft.byte(iter(content)))
-        nt.assert_equal(expected, ft.byte(list(content)))
+        assert expected == ft.byte(content)
+        assert expected == ft.byte(iter(content))
+        assert expected == ft.byte(list(content))
 
     def test_afterish(self):
-        nt.assert_equal(-1, ft.afterish("1001", "."))
-        nt.assert_equal(3, ft.afterish("1,001"))
-        nt.assert_equal(3, ft.afterish("2,100,001.00"))
-        nt.assert_equal(2, ft.afterish("1,000.00", "."))
+        assert -1 == ft.afterish("1001", ".")
+        assert 3 == ft.afterish("1,001")
+        assert 3 == ft.afterish("2,100,001.00")
+        assert 2 == ft.afterish("1,000.00", ".")
 
-        with nt.assert_raises(ValueError):
+        with pytest.raises(ValueError):
             ft.afterish("eggs", ".")
 
     def test_get_separators(self):
         expected = {"thousand_sep": ",", "decimal_sep": "."}
-        nt.assert_equal(expected, ft.get_separators("2,123.45"))
+        assert expected == ft.get_separators("2,123.45")
 
         expected = {"thousand_sep": ".", "decimal_sep": ","}
-        nt.assert_equal(expected, ft.get_separators("2.123,45"))
+        assert expected == ft.get_separators("2.123,45")
 
-        with nt.assert_raises(ValueError):
+        with pytest.raises(ValueError):
             ft.get_separators("spam")
 
     def test_fill(self):
@@ -107,16 +108,16 @@ def test_fill(self):
         previous = {}
         current = next(records)
         expected = {"column_a": "1", "column_b": "27", "column_c": ""}
-        nt.assert_equal(expected, current)
+        assert expected == current
 
         length = len(current)
         filled = ft.fill(previous, current, value=0)
         previous = dict(it.islice(filled, length))
         count = next(filled)
-        nt.assert_equal(count, {"column_a": 0, "column_b": 0, "column_c": 1})
+        assert count == {"column_a": 0, "column_b": 0, "column_c": 1}
 
         expected = {"column_a": "1", "column_b": "27", "column_c": 0}
-        nt.assert_equal(expected, previous)
+        assert expected == previous
 
         current = next(records)
 
@@ -126,27 +127,27 @@ def test_fill(self):
             "column_c": None,
         }
 
-        nt.assert_equal(expected, current)
+        assert expected == current
 
         kwargs = {"fill_key": "column_b", "count": count}
         filled = ft.fill(previous, current, **kwargs)
         previous = dict(it.islice(filled, length))
         count = next(filled)
-        nt.assert_equal({"column_a": 1, "column_b": 0, "column_c": 2}, count)
+        assert {"column_a": 1, "column_b": 0, "column_c": 2} == count
 
         expected = {
             "column_a": "too short!",
             "column_b": "too short!",
             "column_c": "too short!",
         }
 
-        nt.assert_equal(expected, previous)
+        assert expected == previous
 
     @responses.activate
     def test_chunk(self):
         content = io.StringIO("Iñtërnâtiônàližætiøn")
-        nt.assert_equal("Iñtër", next(ft.chunk(content, 5)))
-        nt.assert_equal("nâtiônàližætiøn", next(ft.chunk(content)))
+        assert "Iñtër" == next(ft.chunk(content, 5))
+        assert "nâtiônàližætiøn" == next(ft.chunk(content))
 
         url = "http://google.com"
         body = '<!doctype html><html itemtype="http://schema.org/page">'
@@ -157,46 +158,46 @@ def test_chunk(self):
         # The chunk size is the number of bytes it should read into
         # memory. This is not necessarily the length of each item returned
         # as decoding can take place.
-        nt.assert_equal(20, len(next(ft.chunk(r.iter_content, 20, 29, 200))))
-        nt.assert_equal(55, len(next(ft.chunk(r.iter_content))))
+        assert 20 == len(next(ft.chunk(r.iter_content, 20, 29, 200)))
+        assert 55 == len(next(ft.chunk(r.iter_content)))
 
     def test_combine(self):
         records = [{"a": 1, "b": 2, "c": 3}, {"b": 4, "c": 5, "d": 6}]
 
         # Combine all keys
         pred = lambda key: True
         x, y = records[0], records[1]
-        nt.assert_equal(1, ft.combine(x, y, "a", pred=pred, op=sum))
-        nt.assert_equal(6, ft.combine(x, y, "b", pred=pred, op=sum))
-        nt.assert_equal(8, ft.combine(x, y, "c", pred=pred, op=sum))
+        assert 1 == ft.combine(x, y, "a", pred=pred, op=sum)
+        assert 6 == ft.combine(x, y, "b", pred=pred, op=sum)
+        assert 8 == ft.combine(x, y, "c", pred=pred, op=sum)
 
         fltrer = lambda x: x is not None
         first = lambda x: next(filter(fltrer, x))
         kwargs = {"pred": pred, "op": first, "default": None}
-        nt.assert_equal(2, ft.combine(x, y, "b", **kwargs))
+        assert 2 == ft.combine(x, y, "b", **kwargs)
 
         kwargs = {"pred": pred, "op": stats.mean, "default": None}
-        nt.assert_equal(1.0, ft.combine(x, y, "a", **kwargs))
-        nt.assert_equal(3.0, ft.combine(x, y, "b", **kwargs))
+        assert 1.0 == ft.combine(x, y, "a", **kwargs)
+        assert 3.0 == ft.combine(x, y, "b", **kwargs)
 
         # Only combine key 'b'
         pred = lambda key: key == "b"
-        nt.assert_equal(5, ft.combine(x, y, "c", pred=pred, op=sum))
+        assert 5 == ft.combine(x, y, "c", pred=pred, op=sum)
 
         # Only combine keys that have the same value of 'b'
         pred = itemgetter("b")
-        nt.assert_equal(6, ft.combine(x, y, "b", pred=pred, op=sum))
-        nt.assert_equal(5, ft.combine(x, y, "c", pred=pred, op=sum))
+        assert 6 == ft.combine(x, y, "b", pred=pred, op=sum)
+        assert 5 == ft.combine(x, y, "c", pred=pred, op=sum)
 
     def test_op_everseen(self):
         content = [4, 6, 3, 8, 2, 1]
         expected = [4, 4, 3, 3, 2, 1]
-        nt.assert_equal(expected, list(ft.op_everseen(content, pad=True)))
-        nt.assert_equal([4, 6, 8], list(ft.op_everseen(content, op="gt")))
+        assert expected == list(ft.op_everseen(content, pad=True))
+        assert [4, 6, 8] == list(ft.op_everseen(content, op="gt"))
 
     def test_objectify(self):
         kwargs = {"one": "1", "two": "2"}
         kw = ft.Objectify(kwargs, func=int)
-        nt.assert_equal(kw.one, 1)
-        nt.assert_equal(kw["two"], 2)
-        nt.assert_equal(dict(kw), {"one": 1, "two": 2})
+        assert kw.one == 1
+        assert kw["two"] == 2
+        assert dict(kw) == {"one": 1, "two": 2}