Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 36 insertions, 13 deletions

diff --git a/python3-mako/.footprint b/python3-mako/.footprint
index 49287c521..71f63c03b 100644
--- a/python3-mako/.footprint
+++ b/python3-mako/.footprint
@@ -4,14 +4,14 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/Mako-1.1.6-py3.10.egg-info/
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.1.6-py3.10.egg-info/PKG-INFO
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.1.6-py3.10.egg-info/SOURCES.txt
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.1.6-py3.10.egg-info/dependency_links.txt
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.1.6-py3.10.egg-info/entry_points.txt
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.1.6-py3.10.egg-info/not-zip-safe
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.1.6-py3.10.egg-info/requires.txt
--rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.1.6-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/Mako-1.2.0-py3.10.egg-info/
+-rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.2.0-py3.10.egg-info/PKG-INFO
+-rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.2.0-py3.10.egg-info/SOURCES.txt
+-rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.2.0-py3.10.egg-info/dependency_links.txt
+-rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.2.0-py3.10.egg-info/entry_points.txt
+-rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.2.0-py3.10.egg-info/not-zip-safe
+-rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.2.0-py3.10.egg-info/requires.txt
+-rw-rw-r--	root/root	usr/lib/python3.10/site-packages/Mako-1.2.0-py3.10.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mako/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mako/__pycache__/
@@ -93,4 +93,27 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mako/ext/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/pyparser.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/runtime.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/template.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mako/testing/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__init__.py (EMPTY)
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/_config.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/_config.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/assertions.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/assertions.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/config.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/config.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/exclusions.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/exclusions.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/fixtures.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/fixtures.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/helpers.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/__pycache__/helpers.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/_config.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/assertions.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/config.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/exclusions.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/fixtures.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/testing/helpers.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mako/util.py
diff --git a/python3-mako/.signature b/python3-mako/.signature
index 1186de6d8..8c6236899 100644
--- a/python3-mako/.signature
+++ b/python3-mako/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/U0zSNe6fjBFYVt7+vSZoHvyvZK66QF/i5Q6bUwEESg8lhB62q9GRDQzKng887Al9jUAwjmT8PYHV3nGSTLl0gY=
-SHA256 (Pkgfile) = eac8df52870d0a5876fe9dd187042c17bdd9c604a3d8392ce4a1faf92766e656
-SHA256 (.footprint) = aee3595ed2754cc1a8063736357821ee6d3e8c643c5b65133d4f53d4d60dc844
-SHA256 (Mako-1.1.6.tar.gz) = 4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2
+RWSE3ohX2g5d/Te1oPCc9Xops3ONpkIdsV+C1NqoqngUGxnpGTrFl+ZiJu1pGKh4KxoGTjfuniC3O4UbpWXaV8nsrCcfIELGqww=
+SHA256 (Pkgfile) = 990e761fbb084d3c8df6ed7d2ec1cb06e139e4e74c491624860feeb8c01a8491
+SHA256 (.footprint) = 969890d52431e5dd1369e588969a37db28c0c9439b5b4f59402be1d486af722a
+SHA256 (Mako-1.2.0.tar.gz) = 9a7c7e922b87db3686210cf49d5d767033a41d4010b284e747682c92bddd8b39
diff --git a/python3-mako/Pkgfile b/python3-mako/Pkgfile
index 91d605676..b0700c433 100644
--- a/python3-mako/Pkgfile
+++ b/python3-mako/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: python3-markupsafe
 
 name=python3-mako
-version=1.1.6
+version=1.2.0
 release=1
 source=(https://files.pythonhosted.org/packages/source/M/Mako/Mako-$version.tar.gz)