Skip to content

Commit 9b3f638

Browse files
Merge branch 'release/3.13.0'
2 parents e3d91e2 + 71ba205 commit 9b3f638

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
github: [fedelemantuano]

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ mail_parser.egg-info/
1212
venv
1313
venv27
1414
venv3
15+
venv-mailparser
1516
report/

mailparser/const.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@
7171
r'(?:envelope-sender\s+<(?P<envelope_sender>.+?)>)',
7272

7373
# datetime comes after ; at the end
74-
r';\s*(?P<date>.*)'
74+
r';\s*(?P<date>.*)',
75+
76+
# sendgrid datetime
77+
r'(?P<date>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{9} \+0000 UTC) m=\+\d+\.\d+'
7578
]
7679

7780
RECEIVED_COMPILED_LIST = [

mailparser/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
limitations under the License.
1818
"""
1919

20-
__version__ = "3.12.0"
20+
__version__ = "3.13.0"
2121

2222
if __name__ == "__main__":
2323
print(__version__)

requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# tool
2-
ipaddress==1.0.23
3-
simplejson==3.17.0
4-
six==1.14.0
2+
ipaddress>=1.0.23; python_version < '3.3'
3+
simplejson>=3.17.0
4+
six>=1.14.0
55

66
# dev
77
coverage==5.0.2

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ipaddress==1.0.23
2-
simplejson==3.17.0
3-
six==1.14.0
1+
ipaddress>=1.0.23; python_version < '3.3'
2+
simplejson>=3.17.0
3+
six>=1.14.0

0 commit comments

Comments
 (0)