<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/df419609a3931cd75090442ec4bf4f8a6b43d9c3">https://github.com/macports/macports-ports/commit/df419609a3931cd75090442ec4bf4f8a6b43d9c3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit df419609a3931cd75090442ec4bf4f8a6b43d9c3
</span>Author: Yen Chi Hsuan <yan12125@gmail.com>
AuthorDate: Mon Sep 25 01:43:20 2017 +0800
<span style='display:block; white-space:pre;color:#404040;'> py-curl: Update and add py36 subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Other changes:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Assign myself as the maintainer
</span><span style='display:block; white-space:pre;color:#404040;'> * Drop unused python 2.5 fixes. Python 2.5 has been dropped upstream
</span><span style='display:block; white-space:pre;color:#404040;'> since 2 years ago [1]
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix tests
</span><span style='display:block; white-space:pre;color:#404040;'> * Drop Python versions unsupported by upstream
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://github.com/pycurl/pycurl/pull/303
</span>---
python/py-curl/Portfile | 51 +++++++++++++---------
.../py-curl/files/patch-allow-disable-tests.diff | 13 ++++++
python/py-curl/files/patch-fix-fake-curl.diff | 15 +++++++
python/py-curl/files/patch-grealpath.diff | 13 ++++++
.../py-curl/files/patch-no-nose-show-skipped.diff | 14 ++++++
5 files changed, 86 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-curl/Portfile b/python/py-curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b32482..5938a9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,47 +4,58 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.19.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.43.0.2
</span> categories-append net devel
platforms darwin
license {MIT LGPL}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:yan12125 @yan12125}
</span>
description python interface to libcurl
long_description Python module interface to the cURL library which \
is a tool for transferring files with URL syntax, \
supporting many protocols.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://pycurl.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://pycurl.io/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/download
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://dl.bintray.com/pycurl/pycurl
</span> distname pycurl-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 919d58fe37e69fe87ce4534d8b6a1c7b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 3fb59eca1461331bb9e9e8d6fe3b23eda961a416 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 dab547b3db67ed30cafb556a1a383f567064de49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 89311d1b3bb42a5dbb88609fdbdee6de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d6f40fc0f1e3f69bead2c2b9daf71a7195635f2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 214212
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 36
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-bottle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-flaky \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-nose \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyflakes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:coreutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:curl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-allow-disable-tests.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-fake-curl.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-nose-show-skipped.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-grealpath.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/tests/fake-curl/libcurl/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args --curl-config=${prefix}/bin/curl-config
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.env PYTHONPATH=./build/lib*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.cmd ${python.bin} tests/test_internals.py tests/test_memleak.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete {*}[glob ${worksrcpath}/tests/fake-curl/libcurl/*.so]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Required variants for curl: +http2+gss+sftp_scp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "extra_attrs=',\!http2,\!gssapi,\!ssh' make do-test PYTHON=${python.bin} NOSETESTS=nosetests-${python.branch} PYFLAKES=pyflakes-${python.branch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
destroot.args ${build.args}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} <= 25} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/share/doc/pycurl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
} else {
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-curl/files/patch-allow-disable-tests.diff b/python/py-curl/files/patch-allow-disable-tests.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..44ac6b5
</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-curl/files/patch-allow-disable-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/run.sh b/tests/run.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 683c545..1294733 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/run.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/run.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@ mkdir -p tests/tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export PYTHONSUFFIX=$($PYTHON -V 2>&1 |awk '{print $2}' |awk -F. '{print $1 "." $2}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export PYTHONPATH=$(ls -d build/lib.*$PYTHONSUFFIX):$PYTHONPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extra_attrs=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extra_attrs="$extra_attrs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$CI" = true; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$USECURL" && echo "$USECURL" |grep -q gssapi; then
</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-curl/files/patch-fix-fake-curl.diff b/python/py-curl/files/patch-fix-fake-curl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0b28c62
</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-curl/files/patch-fix-fake-curl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/fake-curl/libcurl/Makefile b/tests/fake-curl/libcurl/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b05bc89..085244d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/fake-curl/libcurl/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/fake-curl/libcurl/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,8 +8,8 @@ all: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SUFFIXES: .c .so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .c.so:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- `curl-config --cc` `curl-config --cflags` -shared -fPIC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -Wl,-soname,$@ -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ `%PREFIX%/bin/curl-config --cc` `%PREFIX%/bin/curl-config --cflags` -shared -fPIC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ show-targets:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ls *c |sed -e 's/.c$$/.so/' | awk '{print $$1 " \\"}'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-curl/files/patch-grealpath.diff b/python/py-curl/files/patch-grealpath.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3db181f
</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-curl/files/patch-grealpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/ext/test-lib.sh b/tests/ext/test-lib.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0cb9489..a8464c4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/ext/test-lib.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/ext/test-lib.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@ unset CDPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cd "$(dirname $0)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z "$TESTDIR"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TESTDIR=$(realpath $(pwd))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TESTDIR=$(grealpath $(pwd))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test_count=0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-curl/files/patch-no-nose-show-skipped.diff b/python/py-curl/files/patch-no-nose-show-skipped.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2eb523d
</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-curl/files/patch-no-nose-show-skipped.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+nose-show-skipped is not compatible with latest nose (1.3.7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/tests/run.sh b/tests/run.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 683c545..eea1a71 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/run.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/run.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,5 +25,5 @@ if test "$CI" = true; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $PYTHON -c 'import pycurl; print(pycurl.version)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$NOSETESTS -a \!standalone"$extra_attrs" --with-flaky --show-skipped "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$NOSETESTS -a standalone --with-flaky --show-skipped "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$NOSETESTS -a \!standalone"$extra_attrs" --with-flaky "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$NOSETESTS -a standalone --with-flaky "$@"
</span></pre><pre style='margin:0'>
</pre>