Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump mail-parser from 3.15.0 to 4.1.2 #5801

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Bump mail-parser from 3.15.0 to 4.1.2 #5801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a9e60a
Bump mail-parser from 3.15.0 to 4.1.2
dependabot[bot] Dec 2, 2024
a5f6657
Only pass naive datetime objects to make_aware()
oliverjwroberts Dec 4, 2024
a140ca6
Re-add simplejson dependency and bump to 3.19.3
oliverjwroberts Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions datahub/interaction/email_processors/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from collections import Counter

import icalendar
from django.utils.timezone import make_aware
from django.utils.timezone import is_naive, make_aware

from datahub.company.contact_matching import (
find_active_contact_by_email_address,
Expand Down Expand Up @@ -236,14 +236,14 @@ def extract_interaction_data_from_email(self):
secondary_advisers = self._extract_secondary_advisers(all_recipients, sender)
contacts = self._extract_and_validate_contacts(all_recipients)
top_company = _get_top_company_from_contacts(contacts)

date = self.message.date
return {
'id': self.message.message_id,
'sender': sender,
'contacts': contacts,
'secondary_advisers': secondary_advisers,
'top_company': top_company,
'date': make_aware(self.message.date),
'date': make_aware(date) if is_naive(date) else date,
'body': self.message.body,
'subject': self.message.subject,
}
8 changes: 5 additions & 3 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ inflection==0.5.1
# via -r requirements.in
iniconfig==1.1.1
# via pytest
ipaddress==1.0.23
# via mail-parser
ipython==8.30.0
# via -r requirements-dev.in
isort==5.11.4
Expand All @@ -239,7 +241,7 @@ jmespath==1.0.1
# botocore
kombu==5.3.7
# via celery
mail-parser==3.15.0
mail-parser==4.1.2
# via -r requirements.in
markupsafe==2.1.2
# via
Expand Down Expand Up @@ -471,8 +473,8 @@ s3transfer==0.10.0
# via boto3
sentry-sdk==2.19.0
# via -r requirements.in
simplejson==3.18.0
# via mail-parser
simplejson==3.19.3
# via -r requirements.in
six==1.16.0
# via
# asttokens
Expand Down
5 changes: 3 additions & 2 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ django-log-formatter-asim==0.0.6
django-mptt==0.16.0
django-pglocks==1.0.4
django-reversion==5.1.0
inflection==0.5.1 # required for DRF shcema features
inflection==0.5.1 # required for DRF schema features
uritemplate==4.1.1 # required for DRF schema features
whitenoise==6.8.2

chardet==5.2.0
pyyaml==6.0.2
python-dateutil==2.9.0.post0
simplejson==3.19.3 # required for correct decimal number serialization

# DBT Platform
dbt-copilot-python==0.2.2
Expand All @@ -35,7 +36,7 @@ notifications-python-client==10.0.0
statsd==4.0.1

# Email
mail-parser==3.15.0
mail-parser==4.1.2
icalendar==6.1.0

# Slack
Expand Down
8 changes: 5 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,15 @@ importlib-metadata==6.11.0
# via opentelemetry-api
inflection==0.5.1
# via -r requirements.in
ipaddress==1.0.23
# via mail-parser
jmespath==1.0.1
# via
# boto3
# botocore
kombu==5.3.7
# via celery
mail-parser==3.15.0
mail-parser==4.1.2
# via -r requirements.in
markupsafe==2.1.2
# via werkzeug
Expand Down Expand Up @@ -300,8 +302,8 @@ s3transfer==0.10.0
# via boto3
sentry-sdk==2.19.0
# via -r requirements.in
simplejson==3.18.0
# via mail-parser
simplejson==3.19.3
# via -r requirements.in
six==1.16.0
# via
# django-pglocks
Expand Down
Loading