<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/8ee6a4e48f467220555a3fb9011749f18ab535df">https://github.com/macports/macports-ports/commit/8ee6a4e48f467220555a3fb9011749f18ab535df</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8ee6a4e48f467220555a3fb9011749f18ab535df
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Thu Sep 12 21:23:10 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> py-curl: revbump and add openssl to deps
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also remove tests as it requires way too much hacks/patches to keep it
</span><span style='display:block; white-space:pre;color:#404040;'> work. The latest issue is that it requires older bottle.py [1].
</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/issues/573
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58995
</span>---
python/py-curl/Portfile | 30 +++-------------------
.../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 ----------
python/py-curl/files/patch-no-http2.diff | 19 --------------
.../py-curl/files/patch-no-nose-show-skipped.diff | 14 ----------
6 files changed, 3 insertions(+), 101 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 5c52cc2..b482799 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;'>@@ -8,7 +8,7 @@ github.setup pycurl pycurl 7_43_0_3 REL_
</span> github.tarball_from archive
name py-curl
version [string map {_ .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append net devel
platforms darwin
license {MIT LGPL}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,25 +30,8 @@ python.versions 27 37
</span> if {${name} ne ${subport}} {
worksrcdir ${github.project}-${git.branch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_test-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-bottle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-flaky \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-nose \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyflakes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:coreutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:curl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-allow-disable-tests.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-fake-curl.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-nose-show-skipped.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-grealpath.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-http2.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/tests/fake-curl/libcurl/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl
</span>
pre-build {
system -W ${build.dir} "${python.bin} setup.py docstrings"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,13 +39,6 @@ if {${name} ne ${subport}} {
</span>
build.args --curl-config=${prefix}/bin/curl-config
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # XXX: the test suite uses 8384 port, which is the default port that syncthing uses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Required variants for curl: +http2+gss+sftp_scp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot.args ${build.args}
livecheck.type none
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 44ac6b5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-curl/files/patch-allow-disable-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tests/run.sh b/tests/run.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 683c545..1294733 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/run.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/run.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,7 @@ mkdir -p tests/tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export PYTHONSUFFIX=$($PYTHON -V 2>&1 |awk '{print $2}' |awk -F. '{print $1 "." $2}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export PYTHONPATH=$(ls -d build/lib.*$PYTHONSUFFIX):$PYTHONPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extra_attrs=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extra_attrs="$extra_attrs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$CI" = true; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -n "$USECURL" && echo "$USECURL" |grep -q gssapi; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0b28c62..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-curl/files/patch-fix-fake-curl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tests/fake-curl/libcurl/Makefile b/tests/fake-curl/libcurl/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b05bc89..085244d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/fake-curl/libcurl/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/fake-curl/libcurl/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,8 +8,8 @@ all: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SUFFIXES: .c .so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .c.so:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- `curl-config --cc` `curl-config --cflags` -shared -fPIC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wl,-soname,$@ -o $@ $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ `%PREFIX%/bin/curl-config --cc` `%PREFIX%/bin/curl-config --cflags` -shared -fPIC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -o $@ $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- show-targets:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3db181f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-curl/files/patch-grealpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tests/ext/test-lib.sh b/tests/ext/test-lib.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0cb9489..a8464c4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/ext/test-lib.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/ext/test-lib.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,7 @@ unset CDPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cd "$(dirname $0)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$TESTDIR"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TESTDIR=$(realpath $(pwd))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TESTDIR=$(grealpath $(pwd))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_count=0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-curl/files/patch-no-http2.diff b/python/py-curl/files/patch-no-http2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 475d110..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-curl/files/patch-no-http2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tests/option_constants_test.py tests/option_constants_test.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d0f999f..78c8a31 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/option_constants_test.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/option_constants_test.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,12 +220,14 @@ class OptionConstantsTest(unittest.TestCase):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl.setopt(curl.UNIX_SOCKET_PATH, '/tmp/socket.sock')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @nose.plugins.attrib.attr('http2')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @util.min_libcurl(7, 36, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def test_ssl_enable_alpn(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl = pycurl.Curl()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl.setopt(curl.SSL_ENABLE_ALPN, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @nose.plugins.attrib.attr('http2')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @util.min_libcurl(7, 36, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def test_ssl_enable_npn(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl = pycurl.Curl()
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2eb523d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-curl/files/patch-no-nose-show-skipped.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-nose-show-skipped is not compatible with latest nose (1.3.7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tests/run.sh b/tests/run.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 683c545..eea1a71 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/run.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/run.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,5 +25,5 @@ if test "$CI" = true; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $PYTHON -c 'import pycurl; print(pycurl.version)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$NOSETESTS -a \!standalone"$extra_attrs" --with-flaky --show-skipped "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$NOSETESTS -a standalone --with-flaky --show-skipped "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$NOSETESTS -a \!standalone"$extra_attrs" --with-flaky "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$NOSETESTS -a standalone --with-flaky "$@"
</span></pre><pre style='margin:0'>
</pre>