Merge pull request #45 from pyrox0/dev

nose -> pytest

Author: chfw

.github/workflows/tests.yml

@@ -7,8 +7,8 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-            python-version: [3.6, 3.7, 3.8, 3.9]
-            os: [macOs-latest, ubuntu-latest, windows-latest]
+            python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12]
+            os: [macos-latest, ubuntu-latest, windows-latest]
 
     runs-on:  ${{ matrix.os }}
     name: run tests
@@ -25,8 +25,8 @@ jobs:
       - name: test
         run: |
           pip freeze
-          nosetests --verbosity=3 --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods
+          pytest
       - name: Upload coverage
         uses: codecov/codecov-action@v1
         with:
-          name:  ${{ matrix.os }} Python ${{ matrix.python-version }}
+          name:  ${{ matrix.os }} Python ${{ matrix.python-version }}

README.rst

@@ -353,7 +353,7 @@ and update CHANGELOG.rst.
 How to test your contribution
 ------------------------------
 
-Although `nose` and `doctest` are both used in code testing, it is adviable that unit tests are put in tests. `doctest` is incorporated only to make sure the code examples in documentation remain valid across different development releases.
+Although `pytest` and `doctest` are both used in code testing, it is adviable that unit tests are put in tests. `doctest` is incorporated only to make sure the code examples in documentation remain valid across different development releases.
 
 On Linux/Unix systems, please launch your tests like this::
 

pyexcel_ods/odsr.py

@@ -7,6 +7,7 @@
     :copyright: (c) 2014-2020 by Onni Software Ltd.
     :license: New BSD License, see LICENSE for more details
 """
+
 # Copyright 2011 Marco Conti
 
 # Licensed under the Apache License, Version 2.0 (the "License");

pyexcel_ods/odsw.py

@@ -7,6 +7,7 @@
     :copyright: (c) 2014-2020 by Onni Software Ltd.
     :license: New BSD License, see LICENSE for more details
 """
+
 import pyexcel_io.service as converter
 from odf.text import P
 from odf.table import Table, TableRow, TableCell

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+addopts = --cov=pyexcel_ods --doctest-glob="*.rst" tests/ README.rst docs/source pyexcel_ods

setup.py

@@ -193,7 +193,7 @@ def filter_out_test_code(file_handle):
         keywords=KEYWORDS,
         python_requires=PYTHON_REQUIRES,
         extras_require=EXTRAS_REQUIRE,
-        tests_require=["nose"],
+        tests_require=["pytest", "pytest-cov"],
         install_requires=INSTALL_REQUIRES,
         packages=PACKAGES,
         include_package_data=True,

test.bat

@@ -1,2 +1,2 @@
 pip freeze
-nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods
+pytest

test.sh

@@ -1,3 +1,3 @@
 #/bin/bash
 pip freeze
-nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods
+pytest

tests/base.py

@@ -1,10 +1,9 @@
 import os  # noqa
 import datetime  # noqa
 
+import pytest
 import pyexcel
 
-from nose.tools import eq_, raises  # noqa
-
 
 def create_sample_file1(file):
     data = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", 1.1, 1]
@@ -29,7 +28,7 @@ class PyexcelHatWriterBase:
     def test_series_table(self):
         pyexcel.save_as(adict=self.content, dest_file_name=self.testfile)
         r = pyexcel.get_sheet(file_name=self.testfile, name_columns_by_row=0)
-        eq_(r.dict, self.content)
+        assert r.dict == self.content
 
 
 class PyexcelWriterBase:
@@ -83,7 +82,7 @@ def test_reading_through_sheets(self):
         expected = [[4, 4, 4, 4], [5, 5, 5, 5], [6, 6, 6, 6]]
         assert data == expected
         data = list(b["Sheet3"].rows())
-        expected = [[u"X", u"Y", u"Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
+        expected = [["X", "Y", "Z"], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
         assert data == expected
         sheet3 = b["Sheet3"]
         sheet3.name_columns_by_row(0)
@@ -96,46 +95,45 @@ class ODSCellTypes:
     def test_formats(self):
         # date formats
         date_format = "%d/%m/%Y"
-        eq_(self.data["Sheet1"][0][0], "Date")
-        eq_(self.data["Sheet1"][1][0].strftime(date_format), "11/11/2014")
-        eq_(self.data["Sheet1"][2][0].strftime(date_format), "01/01/2001")
-        eq_(self.data["Sheet1"][3][0], "")
+        assert self.data["Sheet1"][0][0] == "Date"
+        assert self.data["Sheet1"][1][0].strftime(date_format) == "11/11/2014"
+        assert self.data["Sheet1"][2][0].strftime(date_format) == "01/01/2001"
+        assert self.data["Sheet1"][3][0] == ""
         # time formats
         time_format = "%S:%M:%H"
-        eq_(self.data["Sheet1"][0][1], "Time")
-        eq_(self.data["Sheet1"][1][1].strftime(time_format), "12:12:11")
-        eq_(self.data["Sheet1"][2][1].strftime(time_format), "12:00:00")
-        eq_(self.data["Sheet1"][3][1], 0)
-        eq_(
-            self.data["Sheet1"][4][1],
-            datetime.timedelta(hours=27, minutes=17, seconds=54),
+        assert self.data["Sheet1"][0][1] == "Time"
+        assert self.data["Sheet1"][1][1].strftime(time_format) == "12:12:11"
+        assert self.data["Sheet1"][2][1].strftime(time_format) == "12:00:00"
+        assert self.data["Sheet1"][3][1] == 0
+        assert self.data["Sheet1"][4][1] == datetime.timedelta(
+            hours=27, minutes=17, seconds=54
         )
-        eq_(self.data["Sheet1"][5][1], "Other")
+        assert self.data["Sheet1"][5][1] == "Other"
         # boolean
-        eq_(self.data["Sheet1"][0][2], "Boolean")
-        eq_(self.data["Sheet1"][1][2], True)
-        eq_(self.data["Sheet1"][2][2], False)
+        assert self.data["Sheet1"][0][2] == "Boolean"
+        assert self.data["Sheet1"][1][2] == True
+        assert self.data["Sheet1"][2][2] == False
         # Float
-        eq_(self.data["Sheet1"][0][3], "Float")
-        eq_(self.data["Sheet1"][1][3], 11.11)
+        assert self.data["Sheet1"][0][3] == "Float"
+        assert self.data["Sheet1"][1][3] == 11.11
         # Currency
-        eq_(self.data["Sheet1"][0][4], "Currency")
-        eq_(self.data["Sheet1"][1][4], "1 GBP")
-        eq_(self.data["Sheet1"][2][4], "-10000 GBP")
+        assert self.data["Sheet1"][0][4] == "Currency"
+        assert self.data["Sheet1"][1][4] == "1 GBP"
+        assert self.data["Sheet1"][2][4] == "-10000 GBP"
         # Percentage
-        eq_(self.data["Sheet1"][0][5], "Percentage")
-        eq_(self.data["Sheet1"][1][5], 2)
+        assert self.data["Sheet1"][0][5] == "Percentage"
+        assert self.data["Sheet1"][1][5] == 2
         # int
-        eq_(self.data["Sheet1"][0][6], "Int")
-        eq_(self.data["Sheet1"][1][6], 3)
-        eq_(self.data["Sheet1"][4][6], 11)
+        assert self.data["Sheet1"][0][6] == "Int"
+        assert self.data["Sheet1"][1][6] == 3
+        assert self.data["Sheet1"][4][6] == 11
         # Scientifed not supported
-        eq_(self.data["Sheet1"][1][7], 100000)
+        assert self.data["Sheet1"][1][7] == 100000
         # Fraction
-        eq_(self.data["Sheet1"][1][8], 1.25)
+        assert self.data["Sheet1"][1][8] == 1.25
         # Text
-        eq_(self.data["Sheet1"][1][9], "abc")
+        assert self.data["Sheet1"][1][9] == "abc"
 
-        @raises(IndexError)
         def test_no_excessive_trailing_columns(self):
-            eq_(self.data["Sheet1"][2][6], "")
+            with pytest.raises(IndexError):
+                assert self.data["Sheet1"][2][6] == ""

tests/requirements.txt

@@ -1,7 +1,6 @@
-nose
-mock;python_version<"3"
+pytest
+pytest-cov
 codecov
-coverage
 flake8
 black
 isort

tests/test_bug_fixes.py

@@ -3,85 +3,81 @@
 import os
 
 import psutil
+import pytest
 import pyexcel as pe
 from pyexcel_ods import get_data, save_data
 from pyexcel_io.exceptions import IntegerAccuracyLossError
 
-from nose import SkipTest
-from nose.tools import eq_, raises
-
 IN_TRAVIS = "TRAVIS" in os.environ
 
 
 def test_bug_fix_for_issue_1():
     data = get_data(get_fixtures("repeated.ods"))
-    eq_(data["Sheet1"], [["repeated", "repeated", "repeated", "repeated"]])
+    assert data["Sheet1"] == [["repeated", "repeated", "repeated", "repeated"]]
 
 
 def test_bug_fix_for_issue_2():
     data = {}
     data.update({"Sheet 1": [[1, 2, 3], [4, 5, 6]]})
-    data.update({"Sheet 2": [[u"row 1", u"Héllô!", u"HolÁ!"]]})
+    data.update({"Sheet 2": [["row 1", "Héllô!", "HolÁ!"]]})
     save_data("your_file.ods", data)
     new_data = get_data("your_file.ods")
-    assert new_data["Sheet 2"] == [[u"row 1", u"H\xe9ll\xf4!", u"Hol\xc1!"]]
+    assert new_data["Sheet 2"] == [["row 1", "H\xe9ll\xf4!", "Hol\xc1!"]]
 
 
-@raises(Exception)
 def test_invalid_date():
-    from pyexcel_ods.ods import date_value
-
-    value = "2015-08-"
-    date_value(value)
+    with pytest.raises(Exception):
+        from pyexcel_ods.ods import date_value
 
+        value = "2015-08-"
+        date_value(value)
 
-@raises(Exception)
-def test_fake_date_time_10():
-    from pyexcel_ods.ods import date_value
+    with pytest.raises(Exception):
+        from pyexcel_ods.ods import date_value
 
-    date_value("1234567890")
+        date_value("1234567890")
 
 
-@raises(Exception)
 def test_fake_date_time_19():
-    from pyexcel_ods.ods import date_value
+    with pytest.raises(Exception):
+        from pyexcel_ods.ods import date_value
 
-    date_value("1234567890123456789")
+        date_value("1234567890123456789")
 
 
-@raises(Exception)
 def test_fake_date_time_20():
-    from pyexcel_ods.ods import date_value
+    with pytest.raises(Exception):
+        from pyexcel_ods.ods import date_value
 
-    date_value("12345678901234567890")
+        date_value("12345678901234567890")
 
 
 def test_issue_13():
     test_file = "test_issue_13.ods"
     data = [[1, 2], [], [], [], [3, 4]]
     save_data(test_file, {test_file: data})
     written_data = get_data(test_file, skip_empty_rows=False)
-    eq_(data, written_data[test_file])
+    assert data == written_data[test_file]
     os.unlink(test_file)
 
 
 def test_issue_14():
     # pyexcel issue 61
     test_file = "issue_61.ods"
     data = get_data(get_fixtures(test_file), skip_empty_rows=True)
-    eq_(data["S-LMC"], [[u"aaa"], [0]])
+    assert data["S-LMC"] == [["aaa"], [0]]
 
 
 def test_issue_6():
     test_file = "12_day_as_time.ods"
     data = get_data(get_fixtures(test_file), skip_empty_rows=True)
-    eq_(data["Sheet1"][0][0].days, 12)
+    assert data["Sheet1"][0][0].days == 12
 
 
 def test_issue_19():
     test_file = "pyexcel_81_ods_19.ods"
     data = get_data(get_fixtures(test_file), skip_empty_rows=True)
-    eq_(data["product.template"][1][1], "PRODUCT NAME  PMP")
+    assert data["product.template"][1][1] == "PRODUCT NAME  PMP"
 
 
 def test_issue_83_ods_file_handle():
@@ -110,18 +106,20 @@ def test_issue_83_ods_file_handle():
     pe.free_resources()
     open_files_l4 = proc.open_files()
     # this confirms that no more open file handle
-    eq_(open_files_l1, open_files_l4)
+    assert open_files_l1 == open_files_l4
 
 
 def test_pr_22():
     test_file = get_fixtures("white_space.ods")
     data = get_data(test_file)
-    eq_(data["Sheet1"][0][0], "paragraph with tab(\t),    space, \nnew line")
+    assert (
+        data["Sheet1"][0][0] == "paragraph with tab(\t),    space, \nnew line"
+    )
 
 
 def test_issue_23():
     if not IN_TRAVIS:
-        raise SkipTest()
+        pytest.skip("Need to be in Travis CI to run this test.")
     pe.get_book(
         url=(
             "https://github.com/pyexcel/pyexcel-ods/"
@@ -133,13 +131,13 @@ def test_issue_23():
 def test_issue_24():
     test_file = get_fixtures("comment-in-cell.ods")
     data = get_data(test_file)
-    eq_(data["Sheet1"], [["test"]])
+    assert data["Sheet1"] == [["test"]]
 
 
 def test_issue_27():
     test_file = get_fixtures("issue_27.ods")
     data = get_data(test_file, skip_empty_rows=True)
-    eq_(data["VGPMX"], [["", "Cost Basis", "0"]])
+    assert data["VGPMX"] == [["", "Cost Basis", "0"]]
 
 
 def test_issue_30():
@@ -148,16 +146,16 @@ def test_issue_30():
     sheet[0, 0] = 999999999999999
     sheet.save_as(test_file)
     sheet2 = pe.get_sheet(file_name=test_file)
-    eq_(sheet[0, 0], sheet2[0, 0])
+    assert sheet[0, 0] == sheet2[0, 0]
     os.unlink(test_file)
 
 
-@raises(IntegerAccuracyLossError)
 def test_issue_30_precision_loss():
-    test_file = "issue_30_2.ods"
-    sheet = pe.Sheet()
-    sheet[0, 0] = 9999999999999999
-    sheet.save_as(test_file)
+    with pytest.raises(IntegerAccuracyLossError):
+        test_file = "issue_30_2.ods"
+        sheet = pe.Sheet()
+        sheet[0, 0] = 9999999999999999
+        sheet.save_as(test_file)
 
 
 def get_fixtures(filename):