Skip to content

Commit

Permalink
Merge branch 'testing'
Browse files Browse the repository at this point in the history
  • Loading branch information
BkrmDahal committed Jul 16, 2019
2 parents 4247857 + 29ae3bf commit be50f98
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# constant name <<change these value only>>
PROJECT_NAME = "mailgun"
AUTHOR = "mailgun"
VERSION = "0.1.2"
VERSION = "0.1.3"


# -- General configuration ------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion mailgun/email_parsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def parse_email(email_string: str, email_id: str, output_dir: str = "tmp"):
Return:
Email metadata dict: ``dict``
..code-block:: json
.. code-block:: json
{
"from": [email protected],
Expand Down
30 changes: 19 additions & 11 deletions mailgun/mailgun.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,21 @@ def send_message(
.. code-block:: json
{'id': '<[email protected]>',
'message': 'Queued. Thank you.'}
{
'id': '<[email protected]>',
'message': 'Queued. Thank you.'
}
Example:
.. code-block:: python
send_message(None, "[email protected]",
"Docsumo: Automate invoice data capture at Docsumo", 'welcome_email',
files=['/Users/bikramdahal/Downloads/backup_image/savage and palmer/Behariji Enterprises - BE 32 19-20 DONE.pdf'])
send_message("Text, <[email protected]>",
"[email protected]",
"Docsumo: Automate invoice data capture at Docsumo",
"welcome_email",
files=["./data.pdf])
"""
if text_body:
Expand Down Expand Up @@ -138,16 +142,20 @@ def send_message_template(
.. code-block:: json
{'id': '<[email protected]>',
'message': 'Queued. Thank you.'}
{
'id': '<[email protected]>',
'message': 'Queued. Thank you.'
}
Example:
.. code-block:: python
send_message_template(None, "[email protected]",
"Docsumo: Automate invoice data capture at Docsumo", 'welcome_email',
send_message_template("Text, <[email protected]>",
"[email protected]",
"Docsumo: Automate invoice data capture at Docsumo",
"welcome_email",
{"company_name": "docsumo", "first_name": "bikram"})
"""
Expand Down Expand Up @@ -245,7 +253,7 @@ def mailing_list_add_email(self, list_name: str, data: dict):
def mailing_list_delete_email(self, list_name: str, email: str):

"""
Add user to mailing list
Delete user from mailing list
Args:
list_name: ``str``
Expand All @@ -264,7 +272,7 @@ def mailing_list_delete_email(self, list_name: str, email: str):
def mailing_list_update_email(self, list_name: str, email: str, data: dict):

"""
Add user to mailing list
Update user to detail on mailing list
Args:
list_name: ``str``
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name="mailgun3_python",
version="0.1.2",
version="0.1.3",
description="Mailgun client for python",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down

0 comments on commit be50f98

Please sign in to comment.