<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8481e1ea4106acaaf25aa6c6168284c4c4fb43e7">https://github.com/macports/macports-ports/commit/8481e1ea4106acaaf25aa6c6168284c4c4fb43e7</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 8481e1e  py-scikit-learn: update to 0.21.1
</span>8481e1e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8481e1ea4106acaaf25aa6c6168284c4c4fb43e7
</span>Author: Andrew Stromnov <stromnov@macports.org>
AuthorDate: Tue May 21 13:47:00 2019 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-scikit-learn: update to 0.21.1
</span>---
 python/py-scikit-learn/Portfile                    | 37 ++++++++++++++++++----
 .../patch-sklearn__build_utils___init__.py.diff    | 22 ++++++-------
 2 files changed, 42 insertions(+), 17 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-learn/Portfile b/python/py-scikit-learn/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f72a99..59a76ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scikit-learn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikit-learn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-scikit-learn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             0.20.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             0.21.1
</span> revision            0
 categories-append   science
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ master_sites        pypi:[string index ${python.rootname} 0]/${python.rootname}
</span> 
 distname            ${python.rootname}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  83e04bc34d4adf8836a562550e4ad1405f53fc68 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    11818490
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  a7d9e11e33563e42627e6cc7251fe5dc5d6e4152 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  228d0611e69e5250946f8cd7bbefec75347950f0ca426d0c518db8f06583f660 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    12235771
</span> 
 if {${name} ne ${subport}} {
     depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,33 @@ if {${name} ne ${subport}} {
</span>     depends_lib-append  port:py${python.version}-numpy \
                         port:py${python.version}-scipy
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # force cythonize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   patch-sklearn__build_utils___init__.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} <= 34} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version             0.20.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        distname            ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums           rmd160  83e04bc34d4adf8836a562550e4ad1405f53fc68 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    11818490
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_run-append  port:py${python.version}-joblib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # force cythonize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-sklearn__build_utils___init__.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        python.add_archflags no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.env-append    CPPFLAGS="${configure.cppflags} -Xpreprocessor -fopenmp" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            CFLAGS="${configure.cc_archflags} -I${prefix}/include/libomp" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            CXXFLAGS="${configure.cxx_archflags} -I${prefix}/include/libomp" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            LDFLAGS="${configure.ld_archflags} -L${prefix}/lib/libomp -lomp" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            DYLD_LIBRARY_PATH="${prefix}/lib/libomp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot.env-append CPPFLAGS="${configure.cppflags} -Xpreprocessor -fopenmp" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            CFLAGS="${configure.cc_archflags} -I${prefix}/include/libomp" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            CXXFLAGS="${configure.cxx_archflags} -I${prefix}/include/libomp" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            LDFLAGS="${configure.ld_archflags} -L${prefix}/lib/libomp -lomp" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            DYLD_LIBRARY_PATH="${prefix}/lib/libomp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     livecheck.type      none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-learn/files/patch-sklearn__build_utils___init__.py.diff b/python/py-scikit-learn/files/patch-sklearn__build_utils___init__.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f24fb0..568bf24 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scikit-learn/files/patch-sklearn__build_utils___init__.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikit-learn/files/patch-sklearn__build_utils___init__.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sklearn/_build_utils/__init__.py.orig  2018-11-26 10:01:48.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sklearn/_build_utils/__init__.py       2018-11-26 10:13:29.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def maybe_cythonize_extensions(top_path, config):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sklearn/_build_utils/__init__.py.orig  2019-05-21 12:07:17.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sklearn/_build_utils/__init__.py       2019-05-21 12:08:19.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span>      """Tweaks for building extensions between release and development mode."""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+     with_openmp = check_openmp_support()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span> -    is_release = os.path.exists(os.path.join(top_path, 'PKG-INFO'))
 +    is_release = False
  
      if is_release:
          build_from_c_and_cpp_files(config.ext_modules)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,4 +81,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             exc.args += (message,)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             raise
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        config.ext_modules = cythonize(config.ext_modules)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        config.ext_modules = cythonize(config.ext_modules, force=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,4 +89,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         config.ext_modules = cythonize(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             config.ext_modules,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             compile_time_env={'SKLEARN_OPENMP_SUPPORTED': with_openmp},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            compiler_directives={'language_level': 3})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            compiler_directives={'language_level': 3}, force=True)
</span></pre><pre style='margin:0'>

</pre>