Merge pull request #28 from thombashi/develop

Fix to apply dependent package update

README.rst

@@ -1,12 +1,18 @@
 DateTimeRange
 =============
 
+.. image:: https://badge.fury.io/py/DateTimeRange.svg
+    :target: https://badge.fury.io/py/DateTimeRange
+
 .. image:: https://img.shields.io/pypi/pyversions/DateTimeRange.svg
    :target: https://pypi.python.org/pypi/DateTimeRange
-.. image:: https://travis-ci.org/thombashi/DateTimeRange.svg?branch=master
+
+.. image:: https://img.shields.io/travis/thombashi/DateTimeRange/master.svg?label=Linux
     :target: https://travis-ci.org/thombashi/DateTimeRange
-.. image:: https://ci.appveyor.com/api/projects/status/jhy67bw2y3c8s016/branch/master?svg=true
+
+.. image:: https://img.shields.io/appveyor/ci/thombashi/datetimerange/master.svg?label=Windows
    :target: https://ci.appveyor.com/project/thombashi/datetimerange/branch/master
+
 .. image:: https://coveralls.io/repos/github/thombashi/DateTimeRange/badge.svg?branch=master
     :target: https://coveralls.io/github/thombashi/DateTimeRange?branch=master
 

datetimerange/__init__.py

@@ -143,7 +143,7 @@ def __contains__(self, x):
 
         try:
             value = dateutil.parser.parse(x)
-        except AttributeError:
+        except (TypeError, AttributeError):
             value = x
 
         return self.start_datetime <= value <= self.end_datetime

docs/pages/introduction/badges.txt

@@ -1,8 +1,14 @@
+.. image:: https://badge.fury.io/py/DateTimeRange.svg
+    :target: https://badge.fury.io/py/DateTimeRange
+
 .. image:: https://img.shields.io/pypi/pyversions/DateTimeRange.svg
    :target: https://pypi.python.org/pypi/DateTimeRange
-.. image:: https://travis-ci.org/thombashi/DateTimeRange.svg?branch=master
+
+.. image:: https://img.shields.io/travis/thombashi/DateTimeRange/master.svg?label=Linux
     :target: https://travis-ci.org/thombashi/DateTimeRange
-.. image:: https://ci.appveyor.com/api/projects/status/jhy67bw2y3c8s016/branch/master?svg=true
+
+.. image:: https://img.shields.io/appveyor/ci/thombashi/datetimerange/master.svg?label=Windows
    :target: https://ci.appveyor.com/project/thombashi/datetimerange/branch/master
+
 .. image:: https://coveralls.io/repos/github/thombashi/DateTimeRange/badge.svg?branch=master
     :target: https://coveralls.io/github/thombashi/DateTimeRange?branch=master

requirements/docs_requirements.txt

@@ -1 +1,3 @@
+readmemaker
 sphinx_rtd_theme
+Sphinx

requirements/requirements.txt

@@ -1,2 +1,2 @@
-DataProperty>=0.8.1
-python-dateutil>=2.5.0
+DataProperty>=0.12.0
+python-dateutil>=2.6.0

requirements/test_requirements.txt

@@ -1,3 +1,2 @@
 pytest-cov
 pytest
-python-dateutil>=2.5.0

setup.py

@@ -6,8 +6,8 @@
 MISC_DIR = "misc"
 REQUIREMENT_DIR = "requirements"
 
-needs_pytest = set(['pytest', 'test', 'ptr']).intersection(sys.argv)
-pytest_runner = ['pytest-runner'] if needs_pytest else []
+needs_pytest = set(["pytest", "test", "ptr"]).intersection(sys.argv)
+pytest_runner = ["pytest-runner"] if needs_pytest else []
 
 
 with open("README.rst") as fp:
@@ -24,7 +24,7 @@
 
 setuptools.setup(
     name="DateTimeRange",
-    version="0.2.5",
+    version="0.2.6",
     author="Tsuyoshi Hombashi",
     author_email="gogogo.vm@gmail.com",
     url="https://github.com/thombashi/DateTimeRange",
@@ -34,7 +34,7 @@
     long_description=long_description,
     include_package_data=True,
     install_requires=install_requires,
-    packages=setuptools.find_packages(exclude=['test*']),
+    packages=setuptools.find_packages(exclude=["test*"]),
     setup_requires=pytest_runner,
     tests_require=tests_require,
     classifiers=[