Merge branch 'release/3.13.0'

SpamScope · Nov 24, 2020 · 9b3f638 · 9b3f638
2 parents e3d91e2 + 71ba205
commit 9b3f638
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [fedelemantuano]
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ mail_parser.egg-info/
 venv
 venv27
 venv3
+venv-mailparser
 report/
diff --git a/mailparser/const.py b/mailparser/const.py
@@ -71,7 +71,10 @@
     r'(?:envelope-sender\s+<(?P<envelope_sender>.+?)>)',
 
     # datetime comes after ; at the end
-    r';\s*(?P<date>.*)'
+    r';\s*(?P<date>.*)',
+
+    # sendgrid datetime
+    r'(?P<date>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{9} \+0000 UTC) m=\+\d+\.\d+'
 ]
 
 RECEIVED_COMPILED_LIST = [

diff --git a/mailparser/version.py b/mailparser/version.py
@@ -17,7 +17,7 @@
 limitations under the License.
 """
 
-__version__ = "3.12.0"
+__version__ = "3.13.0"
 
 if __name__ == "__main__":
     print(__version__)
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
 # tool
-ipaddress==1.0.23
-simplejson==3.17.0
-six==1.14.0
+ipaddress>=1.0.23; python_version < '3.3'
+simplejson>=3.17.0
+six>=1.14.0
 
 # dev
 coverage==5.0.2

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-ipaddress==1.0.23
-simplejson==3.17.0
-six==1.14.0
+ipaddress>=1.0.23; python_version < '3.3'
+simplejson>=3.17.0
+six>=1.14.0