<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/56f6244e159335c433a29e86085c7923ab2a7524">https://github.com/macports/macports-ports/commit/56f6244e159335c433a29e86085c7923ab2a7524</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 56f6244e159335c433a29e86085c7923ab2a7524
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Tue Aug 28 12:42:19 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-unittest2: update to 1.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - one version supports both PY2 and PY3
</span><span style='display:block; white-space:pre;color:#404040;'> - apply two upstream patches to use traceback2 everywhere and do not
</span><span style='display:block; white-space:pre;color:#404040;'> require argparse for Python 2.7+
</span><span style='display:block; white-space:pre;color:#404040;'> - update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> - modernize checksums
</span><span style='display:block; white-space:pre;color:#404040;'> - fix livecheck
</span><span style='display:block; white-space:pre;color:#404040;'> - enable tests
</span>---
python/py-unittest2/Portfile | 46 +++++++++++-----------
.../files/patch-argparse-dependency.diff | 41 +++++++++++++++++++
.../files/patch-traceback2-everywhere.diff | 33 ++++++++++++++++
3 files changed, 96 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-unittest2/Portfile b/python/py-unittest2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0559fd..d1c1640 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-unittest2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-unittest2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-unittest2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.0
</span> license PSF
maintainers {aronnax @lpsinger} openmaintainer
# do not add subports for python > 3.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,27 +22,26 @@ platforms darwin
</span> supported_archs noarch
homepage https://pypi.python.org/pypi/unittest2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${python.rootname}-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url {https://pypi.python.org/pypi?:action=doap&name=unittest2}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {<release><Version><revision>([^<]+)</revision></Version></release>}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} < 30} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites pypi:u/unittest2/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname unittest2-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 a0af5cac92bbbfa0c3b0e99571390e0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 aa83b1d6dedaa71a9e6d3bed4028e855bef04821 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 aa5de8cdf654d843379c97bd1ee240e86356d3355a97b147a6f3f4d149247a71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites pypi:u/unittest2py3k/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname unittest2py3k-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 8824ff92044310d9365f90d892bf0f09 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 119f837e7af015fc83e8967fa1388f8745d9895f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 78249c5f1ac508a34d9d131d43a89d77bf154186f3ea5f7a6b993d3f3535d403
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b9294b1ef9a6f0f7d8d2419b3260fc27ba81777d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 81432
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see: last two commits in https://hg.python.org/unittest2, but also don't require argparse for setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-traceback2-everywhere.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-argparse-dependency.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-traceback2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd ${python.bin} setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-unittest2/files/patch-argparse-dependency.diff b/python/py-unittest2/files/patch-argparse-dependency.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ccd1721
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-unittest2/files/patch-argparse-dependency.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# HG changeset patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# User Robert Collins <rbtcollins@hp.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date 1435721660 -43200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Node ID d091f0086b03f4610d41f45c8813c9402c209ccc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Parent 9badd4cde9ab5f70eff42777a00c038192a5541f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use PEP-426 markers to avoid installing argparse.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/README.txt b/README.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/README.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/README.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,6 +169,8 @@ CHANGELOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - Use traceback2 consistently to get consistent output across all Pythons.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- Use PEP-426 markers to avoid installing argparse on 2.7+ Pythons.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2015-06-20 - 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/setup.py b/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@ KEYWORDS = "unittest testing tests".spli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Both install and setup requires - because we read VERSION from within the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # package, and the package also exports all the APIs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # six for compat helpers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-REQUIRES = ['argparse', 'six>=1.4', 'traceback2'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++REQUIRES = ['six>=1.4', 'traceback2']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params = dict(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name=NAME,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,10 @@ params = dict(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ classifiers=CLASSIFIERS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keywords=KEYWORDS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_requires=REQUIRES,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- setup_requires=REQUIRES,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setup_requires=REQUIRES,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extras_require={
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ':python_version<="2.6"': ['argparse'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-unittest2/files/patch-traceback2-everywhere.diff b/python/py-unittest2/files/patch-traceback2-everywhere.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9eaa248
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-unittest2/files/patch-traceback2-everywhere.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# HG changeset patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# User Robert Collins <rbtcollins@hp.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date 1435721195 -43200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Node ID 9badd4cde9ab5f70eff42777a00c038192a5541f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Parent 4174bab908081fa41252f459dbc713246662f98b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use traceback2 everywhere.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/README.txt b/README.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/README.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/README.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,6 +167,8 @@ prevents it being fixed in unittest2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHANGELOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =========
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- Use traceback2 consistently to get consistent output across all Pythons.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2015-06-20 - 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/unittest2/loader.py b/unittest2/loader.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/unittest2/loader.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/unittest2/loader.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import re
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import traceback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import traceback2 as traceback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import unittest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>