Merge branch 'hotfix/v1.0.1'

Author: michaelherold

pyisemail/__init__.py

@@ -1,10 +1,11 @@
 from pyisemail.diagnosis import BaseDiagnosis
 from pyisemail.email_validator import EmailValidator
 from pyisemail.reference import Reference
+from pyisemail.validators import DNSValidator
 from pyisemail.validators import ParserValidator
-from pyisemail.validators.dns_validator import DNSValidator
+from pyisemail.version import VERSION
 
-__version__ = '1.0.0'
+__version__ = VERSION
 __all__ = ['is_email']
 
 

pyisemail/version.py

@@ -0,0 +1 @@
+VERSION = '1.0.1'

setup.py

@@ -2,9 +2,9 @@
 __copyright__ = "Copyright (c) 2013 Michael Herold"
 __license__ = "MIT"
 
+import os
 import sys
 from setuptools import setup
-from pyisemail import __version__
 
 kwargs = {}
 
@@ -23,9 +23,17 @@
 elif sys.version_info[0] == 3:
     dnspython = "dnspython3"
 
+def get_version():
+    basedir = os.path.dirname(__file__)
+    with open(os.path.join(basedir, 'pyisemail/version.py')) as f:
+        locals = {}
+        exec(f.read(), locals)
+        return locals['VERSION']
+    raise RuntimeError('No version information found.')
+
 setup(
     name="pyIsEmail",
-    version=__version__,
+    version=get_version(),
     description="Simple, robust email validation",
     long_description=long_description,
     classifiers=[

tests/data/tests.xml

@@ -679,9 +679,14 @@ Date       Tests        Version Notes
   </test>
   <test id="100">
     <address>test@xn--hxajbheg2az3al.xn--jxalpdlp</address>
-    <comment>A valid IDN from ICANN's <a href="http://idn.icann.org/#The_example.test_names">IDN TLD evaluation gateway</a></comment>
+    <comment>
+      A valid IDN from ICANN's <a href="http://idn.icann.org/#The_example.test_names">IDN TLD evaluation gateway</a>.
+      Marked as flaky on 2014-01-27, as the DNS lookup started
+      returning false and the IDN page is down for maintenance.
+    </comment>
     <category>ISEMAIL_VALID_CATEGORY</category>
     <diagnosis>ISEMAIL_VALID</diagnosis>
+    <flaky>True</flaky>
     <source>Michael Rushton</source>
     <sourcelink>http://squiloople.com/tag/email/</sourcelink>
   </test>