<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4fe759048ab7bb5d810288f54ba24b1307fd6e3f">https://github.com/macports/macports-ports/commit/4fe759048ab7bb5d810288f54ba24b1307fd6e3f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4fe759048ab7bb5d810288f54ba24b1307fd6e3f
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Mon Jul 10 09:24:19 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> docker-compose: Update to version 1.14.0
</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/54451
</span>---
python/docker-compose/Portfile | 27 +++++++++++++++++--------
python/docker-compose/files/patch-setup.py.diff | 11 ++++++++++
2 files changed, 30 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/docker-compose/Portfile b/python/docker-compose/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4393b41..1290338 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/docker-compose/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/docker-compose/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup docker compose 1.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup docker compose 1.14.0
</span> name docker-compose
categories-append devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,25 +17,36 @@ long_description Compose is a tool for defining and running multi-container \
</span> application up in a single command which does everything \
that needs to be done to get it running.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 66ff4979ec6453103e5efed3013863cfdb68375e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 96344e140dc8e8747fb8bc5cf69e07926567d13dc9b78d062052518b488ff7af
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 677e3190583110d79d540b3eb9a26488b212e2a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5d4f4982a041daab4e90ccc3adc63136bdf2db880ebcd73ddb6c40ad4161589c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-setup.py.diff
</span>
python.default_version 27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:py${python.version}-cached-property \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-colorama \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-docker \
</span> port:py${python.version}-dockerpty \
port:py${python.version}-docopt \
port:py${python.version}-jsonschema \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-requests \
</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}-socks \
</span> port:py${python.version}-texttable \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-cached-property
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-websocket-client \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-yaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${python.version} < 33} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-ipaddress
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${python.version} < 34} {
depends_lib-append port:py${python.version}-enum34
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove this after next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|requests >= .*|requests >= 2.6.1, <= 2.10',|" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${python.version} < 35} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-backports-ssl_match_hostname
</span> }
livecheck.regex archive/[join ${github.tag_prefix} ""](\[^"r\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/docker-compose/files/patch-setup.py.diff b/python/docker-compose/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..92b2202
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/docker-compose/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2017-06-15 17:10:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2017-07-07 17:12:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'colorama >= 0.3.7, < 0.4',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'docopt >= 0.6.1, < 0.7',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'PyYAML >= 3.10, < 4',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'requests >= 2.6.1, != 2.11.0, < 2.12',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'requests >= 2.6.1, != 2.11.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'texttable >= 0.8.1, < 0.9',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'websocket-client >= 0.32.0, < 1.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'docker >= 2.3.0, < 3.0',
</span></pre><pre style='margin:0'>
</pre>