<pre style='margin:0'>
Enrico Maria Crisostomo (emcrisostomo) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d2e94f2da30b53a76908a04382d380030c87600a">https://github.com/macports/macports-ports/commit/d2e94f2da30b53a76908a04382d380030c87600a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new d2e94f2  docker-compose: update to 1.25.4
</span>d2e94f2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit d2e94f2da30b53a76908a04382d380030c87600a
</span>Author: Enrico M. Crisostomo <enrico.m.crisostomo@gmail.com>
AuthorDate: Wed Feb 26 13:14:17 2020 +0100

<span style='display:block; white-space:pre;color:#404040;'>    docker-compose: update to 1.25.4
</span>---
 python/docker-compose/Portfile                  | 28 +++++++++++++++++--------
 python/docker-compose/files/patch-setup.py.diff | 11 ----------
 2 files changed, 19 insertions(+), 20 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 64d6c40..5b7f5a4 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;'>@@ -2,14 +2,17 @@
</span> 
 PortSystem          1.0
 PortGroup           python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           github 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        docker compose 1.14.0
</span> name                docker-compose
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version             1.25.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories-append   devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platforms           darwin
 license             Apache-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers         nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers         {emcrisostomo @emcrisostomo} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description         Define and run multi-container applications with Docker
 long_description    Compose is a tool for defining and running multi-container \
                     applications with Docker. With Compose, you define a multi-\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,12 +20,16 @@ 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  677e3190583110d79d540b3eb9a26488b212e2a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  5d4f4982a041daab4e90ccc3adc63136bdf2db880ebcd73ddb6c40ad4161589c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://github.com/docker/compose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  492f40c9a044c85565d61c0f91ba80511638c0be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  fabae2bee4abfa7bdd09125b6bbdcdda81f946c7b16e3ccc6bb2d821ef6488f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    273838
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 38
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version     27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    port:py${python.version}-setuptools
</span> 
 depends_lib-append  port:py${python.version}-cached-property \
                     port:py${python.version}-colorama \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +44,12 @@ depends_lib-append  port:py${python.version}-cached-property \
</span>                     port:py${python.version}-websocket-client \
                     port:py${python.version}-yaml
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${python.version} < 32} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append    port:py${python.version}-subprocess32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${python.version} < 33} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append    port:py${python.version}-backports-shutil_get_terminal_size
</span>     depends_lib-append    port:py${python.version}-ipaddress
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,5 +60,3 @@ if {${python.version} < 34} {
</span> if {${python.version} < 35} {
     depends_lib-append    port:py${python.version}-backports-ssl_match_hostname
 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.livecheck.regex  {([^"r]+)}
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 92b2202..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/docker-compose/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig  2017-06-15 17:10:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2017-07-07 17:12:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'colorama >= 0.3.7, < 0.4',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'docopt >= 0.6.1, < 0.7',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'PyYAML >= 3.10, < 4',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    'requests >= 2.6.1, != 2.11.0, < 2.12',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    'requests >= 2.6.1, != 2.11.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'texttable >= 0.8.1, < 0.9',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'websocket-client >= 0.32.0, < 1.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     'docker >= 2.3.0, < 3.0',
</span></pre><pre style='margin:0'>

</pre>