markdown-merge 0.1.0__tar.gz → 0.1.4__tar.gz

markdown_merge-0.1.4/MANIFEST.in

@@ -0,0 +1,5 @@
+include settings.ini
+include LICENSE
+include CONTRIBUTING.md
+include README.md
+recursive-exclude * __pycache__

{markdown_merge-0.1.0 → markdown_merge-0.1.4}/PKG-INFO

@@ -1,24 +1,23 @@
 Metadata-Version: 2.4
 Name: markdown_merge
-Version: 0.1.0
-Summary: Send templated emails in markdown
-Home-page: https://github.com/answerdotai/markdown_merge/tree/master/
+Version: 0.1.4
+Summary: Send email using markdown
+Home-page: https://github.com/AnswerDotAI/markdown_merge
 Author: Jeremy Howard
-Author-email: info@fast.ai
+Author-email: github@jhoward.fastmail.fm
 License: Apache Software License 2.0
 Keywords: email mail markdown template
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: packaging
+Requires-Dist: fastcore
 Requires-Dist: markdown
 Provides-Extra: dev
 Dynamic: author
@@ -40,11 +39,6 @@ Dynamic: summary
 
 <!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->
 
-``` python
-#hide
-from markdown_merge.markdown_merge import *
-```
-
 ## Install
 
 `pip install markdown_merge`

{markdown_merge-0.1.0 → markdown_merge-0.1.4}/README.md

@@ -3,11 +3,6 @@
 
 <!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->
 
-``` python
-#hide
-from markdown_merge.markdown_merge import *
-```
-
 ## Install
 
 `pip install markdown_merge`

markdown_merge-0.1.4/markdown_merge/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "0.1.4"
+from .core import *

markdown_merge-0.1.4/markdown_merge/_modidx.py

@@ -0,0 +1,19 @@
+# Autogenerated by nbdev
+
+d = { 'settings': { 'branch': 'master',
+                'doc_baseurl': '/markdown_merge',
+                'doc_host': 'https://AnswerDotAI.github.io',
+                'git_url': 'https://github.com/AnswerDotAI/markdown_merge',
+                'lib_path': 'markdown_merge'},
+  'syms': { 'markdown_merge.core': { 'markdown_merge.core.MarkdownMerge': ('core.html#markdownmerge', 'markdown_merge/core.py'),
+                                     'markdown_merge.core.MarkdownMerge.__init__': ( 'core.html#markdownmerge.__init__',
+                                                                                     'markdown_merge/core.py'),
+                                     'markdown_merge.core.MarkdownMerge.reset': ('core.html#markdownmerge.reset', 'markdown_merge/core.py'),
+                                     'markdown_merge.core.MarkdownMerge.send_msgs': ( 'core.html#markdownmerge.send_msgs',
+                                                                                      'markdown_merge/core.py'),
+                                     'markdown_merge.core.attach_file': ('core.html#attach_file', 'markdown_merge/core.py'),
+                                     'markdown_merge.core.create_multipart_msg': ( 'core.html#create_multipart_msg',
+                                                                                   'markdown_merge/core.py'),
+                                     'markdown_merge.core.get_addr': ('core.html#get_addr', 'markdown_merge/core.py'),
+                                     'markdown_merge.core.md2email': ('core.html#md2email', 'markdown_merge/core.py'),
+                                     'markdown_merge.core.smtp_connection': ('core.html#smtp_connection', 'markdown_merge/core.py')}}}

{markdown_merge-0.1.0 → markdown_merge-0.1.4}/markdown_merge/core.py

@@ -1,11 +1,11 @@
 """API details"""
 
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../00_core.ipynb.
+# AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/00_core.ipynb.
 
 # %% auto 0
 __all__ = ['get_addr', 'attach_file', 'create_multipart_msg', 'md2email', 'smtp_connection', 'MarkdownMerge']
 
-# %% ../00_core.ipynb 2
+# %% ../nbs/00_core.ipynb
 import os,mimetypes,smtplib
 
 from fastcore.utils import *
@@ -19,12 +19,12 @@ from markdown import markdown
 from email.headerregistry import Address
 from time import sleep
 
-# %% ../00_core.ipynb 6
+# %% ../nbs/00_core.ipynb
 def get_addr(email, name=None):
     "Convert `email` and optional `name` into an email `Address` object"
     return Address(email if name is None else name, addr_spec=email)
 
-# %% ../00_core.ipynb 9
+# %% ../nbs/00_core.ipynb
 def attach_file(msg, f):
     "Attach file `f` to message `msg`"
     mtype,_ = mimetypes.guess_type(f)
@@ -35,7 +35,7 @@ def attach_file(msg, f):
     part['Content-Disposition'] = f'attachment; filename={Path(f).name}'
     msg.attach(part)
 
-# %% ../00_core.ipynb 11
+# %% ../nbs/00_core.ipynb
 def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=None):
     "Create a multipart email with markdown text and HTML"
     msg = MIMEMultipart('alternative')
@@ -46,13 +46,13 @@ def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=N
     for f in listify(attach): attach_file(msg, f)
     return msg
 
-# %% ../00_core.ipynb 13
+# %% ../nbs/00_core.ipynb
 def md2email(subj, from_addr, to_addrs, md, attach=None):
     "Create a multipart email from markdown"
     html = markdown(md)
     return create_multipart_msg(subj, from_addr, to_addrs, md=md, html=html, attach=attach)
 
-# %% ../00_core.ipynb 23
+# %% ../nbs/00_core.ipynb
 @contextmanager
 def smtp_connection(host, port, user=None, password=None, use_ssl=True, use_tls=False):
     "Context manager for SMTP connection"
@@ -62,7 +62,7 @@ def smtp_connection(host, port, user=None, password=None, use_ssl=True, use_tls=
     try: yield conn
     finally: conn.quit()
 
-# %% ../00_core.ipynb 27
+# %% ../nbs/00_core.ipynb
 class MarkdownMerge:
     "Send templated email merge messages formatted with Markdown"
     def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False):

{markdown_merge-0.1.0 → markdown_merge-0.1.4}/markdown_merge.egg-info/PKG-INFO

@@ -1,24 +1,23 @@
 Metadata-Version: 2.4
 Name: markdown_merge
-Version: 0.1.0
-Summary: Send templated emails in markdown
-Home-page: https://github.com/answerdotai/markdown_merge/tree/master/
+Version: 0.1.4
+Summary: Send email using markdown
+Home-page: https://github.com/AnswerDotAI/markdown_merge
 Author: Jeremy Howard
-Author-email: info@fast.ai
+Author-email: github@jhoward.fastmail.fm
 License: Apache Software License 2.0
 Keywords: email mail markdown template
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: packaging
+Requires-Dist: fastcore
 Requires-Dist: markdown
 Provides-Extra: dev
 Dynamic: author
@@ -40,11 +39,6 @@ Dynamic: summary
 
 <!-- WARNING: THIS FILE WAS AUTOGENERATED! DO NOT EDIT! -->
 
-``` python
-#hide
-from markdown_merge.markdown_merge import *
-```
-
 ## Install
 
 `pip install markdown_merge`

{markdown_merge-0.1.0 → markdown_merge-0.1.4}/markdown_merge.egg-info/SOURCES.txt

@@ -1,12 +1,12 @@
 LICENSE
+MANIFEST.in
 README.md
 pyproject.toml
+settings.ini
 setup.py
 markdown_merge/__init__.py
 markdown_merge/_modidx.py
-markdown_merge/_nbdev.py
 markdown_merge/core.py
-markdown_merge/markdown_merge.py
 markdown_merge.egg-info/PKG-INFO
 markdown_merge.egg-info/SOURCES.txt
 markdown_merge.egg-info/dependency_links.txt

{markdown_merge-0.1.0 → markdown_merge-0.1.4}/markdown_merge.egg-info/requires.txt

@@ -1,4 +1,4 @@
-packaging
+fastcore
 markdown
 
 [dev]

markdown_merge-0.1.4/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=64.0"]
+build-backend = "setuptools.build_meta"

markdown_merge-0.1.4/settings.ini

@@ -0,0 +1,39 @@
+[DEFAULT]
+repo = markdown_merge
+lib_name = markdown_merge
+version = 0.1.4
+min_python = 3.10
+license = apache2
+black_formatting = False
+requirements = fastcore markdown
+doc_path = _docs
+lib_path = markdown_merge
+nbs_path = nbs
+recursive = True
+tst_flags = notest
+put_version_in_init = True
+update_pyproject = True
+branch = master
+custom_sidebar = False
+doc_host = https://AnswerDotAI.github.io
+doc_baseurl = /markdown_merge
+git_url = https://github.com/AnswerDotAI/markdown_merge
+title = markdown_merge
+audience = Developers
+author = Jeremy Howard
+author_email = github@jhoward.fastmail.fm
+copyright = 2025 onwards, Jeremy Howard
+description = Send email using markdown
+keywords = email mail markdown template
+language = English
+status = 3
+user = AnswerDotAI
+cell_number = False
+readme_nb = index.ipynb
+allowed_metadata_keys = 
+allowed_cell_metadata_keys = 
+jupyter_hooks = False
+clean_ids = True
+clear_all = False
+skip_procs = 
+

{markdown_merge-0.1.0 → markdown_merge-0.1.4}/setup.py

@@ -1,11 +1,11 @@
 from pkg_resources import parse_version
 from configparser import ConfigParser
-import setuptools,re,sys
+import setuptools, shlex
 assert parse_version(setuptools.__version__)>=parse_version('36.2')
 
 # note: all settings are in settings.ini; edit there, not here
 config = ConfigParser(delimiters=['='])
-config.read('settings.ini')
+config.read('settings.ini', encoding='utf-8')
 cfg = config['DEFAULT']
 
 cfg_keys = 'version description keywords author author_email'.split()
@@ -13,46 +13,46 @@ expected = cfg_keys + "lib_name user branch license status min_python audience l
 for o in expected: assert o in cfg, "missing expected setting: {}".format(o)
 setup_cfg = {o:cfg[o] for o in cfg_keys}
 
-if len(sys.argv)>1 and sys.argv[1]=='version':
-    print(setup_cfg['version'])
-    exit()
-
 licenses = {
     'apache2': ('Apache Software License 2.0','OSI Approved :: Apache Software License'),
+    'mit': ('MIT License', 'OSI Approved :: MIT License'),
+    'gpl2': ('GNU General Public License v2', 'OSI Approved :: GNU General Public License v2 (GPLv2)'),
+    'gpl3': ('GNU General Public License v3', 'OSI Approved :: GNU General Public License v3 (GPLv3)'),
+    'bsd3': ('BSD License', 'OSI Approved :: BSD License'),
 }
 statuses = [ '1 - Planning', '2 - Pre-Alpha', '3 - Alpha',
     '4 - Beta', '5 - Production/Stable', '6 - Mature', '7 - Inactive' ]
-py_versions = '3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13'.split()
-min_python = cfg['min_python']
-lic = licenses[cfg['license']]
+py_versions = '3.6 3.7 3.8 3.9 3.10 3.11 3.12'.split()
 
-requirements = ['packaging']
-if cfg.get('requirements'): requirements += cfg.get('requirements','').split()
-if cfg.get('pip_requirements'): requirements += cfg.get('pip_requirements','').split()
+requirements = shlex.split(cfg.get('requirements', ''))
+if cfg.get('pip_requirements'): requirements += shlex.split(cfg.get('pip_requirements', ''))
+min_python = cfg['min_python']
+lic = licenses.get(cfg['license'].lower(), (cfg['license'], None))
 dev_requirements = (cfg.get('dev_requirements') or '').split()
 
-long_description = open('README.md', encoding="utf8").read()
-# ![png](docs/images/output_13_0.png)
-for ext in ['png', 'svg']:
-    long_description = re.sub(r'!\['+ext+'\]\((.*)\)', '!['+ext+']('+'https://raw.githubusercontent.com/{}/{}'.format(cfg['user'],cfg['lib_name'])+'/'+cfg['branch']+'/\\1)', long_description)
-    long_description = re.sub(r'src=\"(.*)\.'+ext+'\"', 'src=\"https://raw.githubusercontent.com/{}/{}'.format(cfg['user'],cfg['lib_name'])+'/'+cfg['branch']+'/\\1.'+ext+'\"', long_description)
+package_data = dict()
+pkg_data = cfg.get('package_data', None)
+if pkg_data:
+    package_data[cfg['lib_name']] =  pkg_data.split() # split as multiple files might be listed
+# Add package data to setup_cfg for setuptools.setup(..., **setup_cfg)
+setup_cfg['package_data'] = package_data
 
 setuptools.setup(
-    name = 'markdown-merge',
+    name = cfg['lib_name'],
     license = lic[0],
     classifiers = [
         'Development Status :: ' + statuses[int(cfg['status'])],
         'Intended Audience :: ' + cfg['audience'].title(),
-        'License :: ' + lic[1],
         'Natural Language :: ' + cfg['language'].title(),
-    ] + ['Programming Language :: Python :: '+o for o in py_versions[py_versions.index(min_python):]],
+    ] + ['Programming Language :: Python :: '+o for o in py_versions[py_versions.index(min_python):]] + (['License :: ' + lic[1] ] if lic[1] else []),
     url = cfg['git_url'],
     packages = setuptools.find_packages(),
     include_package_data = True,
     install_requires = requirements,
     extras_require={ 'dev': dev_requirements },
+    dependency_links = cfg.get('dep_links','').split(),
     python_requires  = '>=' + cfg['min_python'],
-    long_description = long_description,
+    long_description = open('README.md', encoding='utf-8').read(),
     long_description_content_type = 'text/markdown',
     zip_safe = False,
     entry_points = {
@@ -61,3 +61,4 @@ setuptools.setup(
     },
     **setup_cfg)
 
+

markdown_merge-0.1.0/markdown_merge/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.1.0"
-from .core import *

markdown_merge-0.1.0/markdown_merge/_modidx.py

@@ -1,37 +0,0 @@
-# Autogenerated by nbdev
-
-d = { 'settings': { 'branch': 'master',
-                'doc_baseurl': '/',
-                'doc_host': 'https://answerdotai.github.io',
-                'git_url': 'https://github.com/answerdotai/markdown_merge/tree/master/',
-                'lib_path': 'markdown_merge'},
-  'syms': { 'markdown_merge.core': { 'markdown_merge.core.MarkdownMerge': ('core.html#markdownmerge', 'markdown_merge/core.py'),
-                                     'markdown_merge.core.MarkdownMerge.__init__': ( 'core.html#markdownmerge.__init__',
-                                                                                     'markdown_merge/core.py'),
-                                     'markdown_merge.core.MarkdownMerge.reset': ('core.html#markdownmerge.reset', 'markdown_merge/core.py'),
-                                     'markdown_merge.core.MarkdownMerge.send_msgs': ( 'core.html#markdownmerge.send_msgs',
-                                                                                      'markdown_merge/core.py'),
-                                     'markdown_merge.core.attach_file': ('core.html#attach_file', 'markdown_merge/core.py'),
-                                     'markdown_merge.core.create_multipart_msg': ( 'core.html#create_multipart_msg',
-                                                                                   'markdown_merge/core.py'),
-                                     'markdown_merge.core.get_addr': ('core.html#get_addr', 'markdown_merge/core.py'),
-                                     'markdown_merge.core.md2email': ('core.html#md2email', 'markdown_merge/core.py'),
-                                     'markdown_merge.core.smtp_connection': ('core.html#smtp_connection', 'markdown_merge/core.py')},
-            'markdown_merge.markdown_merge': { 'markdown_merge.markdown_merge.MarkdownMerge': ( 'markdown_merge.html#markdownmerge',
-                                                                                                'markdown_merge/markdown_merge.py'),
-                                               'markdown_merge.markdown_merge.MarkdownMerge.__init__': ( 'markdown_merge.html#markdownmerge.__init__',
-                                                                                                         'markdown_merge/markdown_merge.py'),
-                                               'markdown_merge.markdown_merge.MarkdownMerge.reset': ( 'markdown_merge.html#markdownmerge.reset',
-                                                                                                      'markdown_merge/markdown_merge.py'),
-                                               'markdown_merge.markdown_merge.MarkdownMerge.send_msgs': ( 'markdown_merge.html#markdownmerge.send_msgs',
-                                                                                                          'markdown_merge/markdown_merge.py'),
-                                               'markdown_merge.markdown_merge.attach_file': ( 'markdown_merge.html#attach_file',
-                                                                                              'markdown_merge/markdown_merge.py'),
-                                               'markdown_merge.markdown_merge.create_multipart_msg': ( 'markdown_merge.html#create_multipart_msg',
-                                                                                                       'markdown_merge/markdown_merge.py'),
-                                               'markdown_merge.markdown_merge.get_addr': ( 'markdown_merge.html#get_addr',
-                                                                                           'markdown_merge/markdown_merge.py'),
-                                               'markdown_merge.markdown_merge.md2email': ( 'markdown_merge.html#md2email',
-                                                                                           'markdown_merge/markdown_merge.py'),
-                                               'markdown_merge.markdown_merge.smtp_connection': ( 'markdown_merge.html#smtp_connection',
-                                                                                                  'markdown_merge/markdown_merge.py')}}}

markdown_merge-0.1.0/markdown_merge/_nbdev.py

@@ -1,9 +0,0 @@
-#AUTOGENERATED BY NBDEV! DO NOT EDIT!
-
-__all__ = ["index", "modules"]
-
-index = {"get_addr": "00_markdown_merge.ipynb",
-         "md2email": "00_markdown_merge.ipynb",
-         "MarkdownMerge": "00_markdown_merge.ipynb"}
-
-modules = ["markdown_merge.py"]

markdown_merge-0.1.0/markdown_merge/markdown_merge.py

@@ -1,85 +0,0 @@
-"""API details"""
-
-# AUTOGENERATED! DO NOT EDIT! File to edit: ../00_markdown_merge.ipynb.
-
-# %% auto 0
-__all__ = ['get_addr', 'attach_file', 'create_multipart_msg', 'md2email', 'smtp_connection', 'MarkdownMerge']
-
-# %% ../00_markdown_merge.ipynb 2
-import os,mimetypes,smtplib
-
-from fastcore.utils import *
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from email.mime.base import MIMEBase
-from email import encoders
-
-from contextlib import contextmanager
-from markdown import markdown
-from email.headerregistry import Address
-from time import sleep
-
-# %% ../00_markdown_merge.ipynb 6
-def get_addr(email, name=None):
-    "Convert `email` and optional `name` into an email `Address` object"
-    return Address(email if name is None else name, addr_spec=email)
-
-# %% ../00_markdown_merge.ipynb 9
-def attach_file(msg, f):
-    "Attach file `f` to message `msg`"
-    mtype,_ = mimetypes.guess_type(f)
-    main,sub = (mtype or 'application/octet-stream').split('/', 1)
-    part = MIMEBase(main, sub)
-    with open(f, 'rb') as fp: part.set_payload(fp.read())
-    encoders.encode_base64(part)
-    part['Content-Disposition'] = f'attachment; filename={Path(f).name}'
-    msg.attach(part)
-
-# %% ../00_markdown_merge.ipynb 11
-def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=None):
-    "Create a multipart email with markdown text and HTML"
-    msg = MIMEMultipart('alternative')
-    msg['Subject'],msg['From'] = subj,str(from_addr)
-    msg['To'] = ', '.join([str(a) for a in listify(to_addrs)])
-    if md: msg.attach(MIMEText(md, 'plain'))
-    if html: msg.attach(MIMEText(html, 'html'))
-    for f in listify(attach): attach_file(msg, f)
-    return msg
-
-# %% ../00_markdown_merge.ipynb 13
-def md2email(subj, from_addr, to_addrs, md, attach=None):
-    "Create a multipart email from markdown"
-    html = markdown(md)
-    return create_multipart_msg(subj, from_addr, to_addrs, md=md, html=html, attach=attach)
-
-# %% ../00_markdown_merge.ipynb 22
-@contextmanager
-def smtp_connection(host, port, user=None, password=None, use_ssl=True, use_tls=False):
-    "Context manager for SMTP connection"
-    conn = smtplib.SMTP_SSL(host, port) if use_ssl else smtplib.SMTP(host, port)
-    if use_tls and not use_ssl: conn.starttls()
-    if user and password: conn.login(user, password)
-    try: yield conn
-    finally: conn.quit()
-
-# %% ../00_markdown_merge.ipynb 26
-class MarkdownMerge:
-    "Send templated email merge messages formatted with Markdown"
-    def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False):
-        self.addrs,self.from_addr,self.subj,self.msg,self.i = addrs,from_addr,subj,msg,0
-        self.inserts = [{}]*len(addrs) if inserts is None else inserts
-        self.smtp_cfg,self.test = smtp_cfg,test
-
-    def send_msgs(self, pause=0.5):
-        "Send all unsent messages to `addrs` with `pause` secs between each send"
-        with smtp_connection(**self.smtp_cfg) as conn:
-            while self.i < len(self.addrs):
-                addr,insert = self.addrs[self.i],self.inserts[self.i]
-                msg = self.msg.format(**insert)
-                eml = md2email(self.subj, self.from_addr, addr, md=msg)
-                if self.test: print(f"To: {addr}\n{'-'*40}\n{msg}\n{'='*40}\n")
-                else: conn.send_message(eml); sleep(pause)
-                self.i += 1
-                if self.i%100==0: print(self.i)
-
-    def reset(self): self.i=0

markdown_merge-0.1.0/pyproject.toml

@@ -1,11 +0,0 @@
-[build-system]
-requires = ["setuptools>=64.0"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name="markdown_merge"
-requires-python=">=3.10"
-dynamic = [ "keywords", "description", "version", "dependencies", "optional-dependencies", "readme", "license", "authors", "classifiers", "entry-points", "scripts", "urls"]
-
-[tool.uv]
-cache-keys = [{ file = "pyproject.toml" }, { file = "settings.ini" }, { file = "setup.py" }]