Made unit tests use pytest instead of unittest

.travis.yml

@@ -1,12 +1,15 @@
 language: python
 python:
-    - 2.7
-    - 3.3
-    - 3.4
-    - 3.5
+    - "2.7"
+    - "pypy"
+    - "3.3"
+    - "3.4"
+    - "3.5"
+    - "3.6"
 install:
-    - pip install codecov
+    - pip install -r requirements.txt
+    - pip install -r test-requirements.txt
 script:
-    - coverage run -m unittest spans.tests.suite
+    - pytest
 after_success:
     - codecov

MANIFEST.in

@@ -1,3 +1,3 @@
 recursive-include spans *.py
 
-include MANIFEST.in LICENSE README.rst Makefile setup.py setup.cfg tox.ini doc/*.rst
+include MANIFEST.in LICENSE README.rst Makefile setup.py setup.cfg doc/*.rst

README.rst

@@ -23,7 +23,7 @@ the 90s.
     >>> date(2000, 1, 1) in the90s
     False
     >>> the90s.union(daterange(date(2000, 1, 1), date(2010, 1, 1)))
-    daterange([datetime.date(1990, 1, 1), datetime.date(2010, 1, 1))))
+    daterange([datetime.date(1990, 1, 1),datetime.date(2010, 1, 1)))
 
 If you are making a booking application for a bed and breakfast hotel and want
 to ensure no room gets double booked:

doc/changelog.rst

@@ -10,7 +10,9 @@ Released on <unreleased>
 
 - Fixed :class:`~spans.types.daterange` not accepting subclasses of ``date``
   (`bug #5 <https://github.com/runfalk/spans/issues/5>`_)
-
+- Fixed some broken doctests
+- Moved unit tests to `pytest <http://docs.pytest.org/en/latest/>`_
+- Removed `Tox <https://tox.readthedocs.io/en/latest/>`_ config
 
 Version 0.3.0
 -------------

doc/conftest.py

@@ -0,0 +1,13 @@
+import spans
+import pytest
+
+from datetime import date, datetime, timedelta
+
+@pytest.fixture(autouse=True)
+def doctest_fixture(doctest_namespace):
+    for attr in spans.__all__:
+        doctest_namespace[attr] = getattr(spans, attr)
+
+    doctest_namespace["date"] = date
+    doctest_namespace["datetime"] = datetime
+    doctest_namespace["timedelta"] = timedelta

doc/ranges.rst

@@ -73,7 +73,7 @@ Range sets are sets of intervals, where each element must be represented by one
 .. code-block:: python
 
 	>>> intrangeset([intrange(1, 5), intrange(10, 15)])
-	intrangeset([intrange([1, 5)), intrange([10,15))])
+	intrangeset([intrange([1,5)), intrange([10,15))])
 
 Like ranges, range sets support :class:`~spans.settypes.rangeset.union`, :class:`~spans.settypes.rangeset.difference` and :class:`~spans.settypes.rangeset.intersection`. Contrary to Python's built in sets these operations do not modify the range set in place. Instead it returns a new set. Unchanged ranges are reused to conserve memory since ranges are immutable.
 

requirements.txt

@@ -0,0 +1,2 @@
+--index-url https://pypi.python.org/simple/
+-e .

setup.cfg

@@ -1,2 +1,11 @@
 [bdist_wheel]
 universal = 1
+
+[coverage:run]
+branch = True
+
+[tool:pytest]
+addopts = --doctest-glob="*.rst" --doctest-modules --cov=spans/
+doctest_optionflags = ALLOW_UNICODE ALLOW_BYTES
+norecursedirs = _build
+testpaths = spans tests doc README.rst

setup.py

@@ -5,6 +5,7 @@
 
 from setuptools import setup
 
+
 class RstPreProcessor(object):
     def __init__(self):
         self.roles = {}
@@ -80,7 +81,7 @@ def process(self, text):
 @rst_pre_processor.add_role("class")
 @rst_pre_processor.add_role("attr")
 @rst_pre_processor.add_role("meth")
-def role_simplyfier(processor, role, argument, content):
+def role_simplifier(processor, role, argument, content):
     format = {
         "attr": "``.{}``",
         "meth": "``{}()``",
@@ -91,20 +92,16 @@ def role_simplyfier(processor, role, argument, content):
     else:
         return format.get(role, "``{}``").format(content + extra.get(role, ""))
 
-@rst_pre_processor.add_block("image")
-def image_remover(processor, block, args, extra, content):
-    if extra is not None:
-        processor.add_replacement(extra, "")
-    return ""
 
 @rst_pre_processor.add_block("include")
 def includer(processor, block, args, extra, content):
     with open(args) as fp:
         return fp.read().rstrip()
 
+
 def rst_preprocess(file):
     """
-    Preprocess rST file to support Sphinx like include directive. Includes are
+    Preprocess reST file to support Sphinx like include directive. Includes are
     relative to the current working directory.
     """
 
@@ -115,16 +112,14 @@ def rst_preprocess(file):
             fp.read(),
             flags=re.MULTILINE)
 
+
 with open("README.rst") as fp:
     long_desc = rst_pre_processor.process(fp.read())
 
+
 with open("spans/__init__.py") as fp:
     version = re.search('__version__\s+=\s+"([^"]+)', fp.read()).group(1)
 
-requirements = []
-if os.path.exists("requirements.txt"):
-    with open("requirements.txt") as fp:
-        requirements = fp.read().split("\n")
 
 if __name__ == "__main__":
     setup(
@@ -137,7 +132,7 @@ def rst_preprocess(file):
         author_email="andreas@runfalk.se",
         url="https://www.github.com/runfalk/spans",
         packages=["spans"],
-        install_requires=requirements,
+        install_requires=[],
         classifiers=(
             "Development Status :: 5 - Production/Stable",
             "Intended Audience :: Developers",
@@ -152,5 +147,4 @@ def rst_preprocess(file):
             "Topic :: Utilities"
         ),
         zip_safe=False,
-        test_suite="spans.tests.suite"
     )

spans/settypes.py

@@ -534,7 +534,7 @@ class strrangeset(rangeset):
 
         >>> strrangeset([
         ...     strrange(u"a", u"f", upper_inc=True),
-        ...     strrange(u"0", u"9", upper_inc=True)]) # doctest: +IGNORE_UNICODE
+        ...     strrange(u"0", u"9", upper_inc=True)])
         strrangeset([strrange([u'0',u':')), strrange([u'a',u'g'))])
 
     Inherits methods from :class:`~spans.settypes.rangeset` and