<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bfba8aa6875ed9136b98def18025ce6cfccc7d3d">https://github.com/macports/macports-ports/commit/bfba8aa6875ed9136b98def18025ce6cfccc7d3d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bfba8aa6875ed9136b98def18025ce6cfccc7d3d
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Jan 7 09:55:55 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: remove py27 and py3[34] subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove no longer needed patchfiles and rename the patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'> containting "34" to "27"
</span><span style='display:block; white-space:pre;color:#404040;'> - update modeline
</span>---
python/py-numpy/Portfile | 29 +++++-------------
python/py-numpy/files/patch-f2py_setup.py.diff | 20 -------------
python/py-numpy/files/patch-fcompiler_g95.26.diff | 11 -------
...ler_g95.34.diff => patch-fcompiler_g95.27.diff} | 0
.../files/patch-numpy_core_setup.py.26.diff | 34 ----------------------
...y.34.diff => patch-numpy_core_setup.py.27.diff} | 0
.../patch-numpy_distutils_fcompiler_gnu.py.26.diff | 11 -------
.../patch-numpy_tests_test_scripts.py.26.diff | 18 ------------
...f => patch-numpy_tests_test_scripts.py.27.diff} | 0
9 files changed, 7 insertions(+), 116 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b8471e..9d3bd4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ if {${name} ne ${subport}} {
</span> pre-destroot { set_compilers }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27 33 34 35 36 37 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37 38
</span>
# http://trac.macports.org/ticket/34562
python.consistent_destroot yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,35 +36,20 @@ python.consistent_destroot yes
</span> #universal_variant no
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} == 26 || ${python.version} == 33} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup numpy numpy 1.11.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8cc323d5944301aefa1f66f17d4af14c364c6b32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dbdda9104c7dbc2d8ae691367a2bb1815a62598c5278097b4eee035b85abf6a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4387593
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-numpy_core_setup.py.26.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_distutils_fcompiler_gnu.py.26.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_tests_test_scripts.py.26.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fcompiler_g95.26.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-f2py_setup.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/numpy/f2py/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${python.version} == 27 || ${python.version} == 34} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} == 27} {
</span> github.setup numpy numpy 1.16.4 v
checksums rmd160 a5a18f70e57962b9691eeef28bae9f0c3851279f \
sha256 86e12b00ca36643c63184b5e45373727603a9e073177f24ce2c4b5a4a9dabc04 \
size 4676166
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-numpy_core_setup.py.34.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_tests_test_scripts.py.34.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fcompiler_g95.34.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-numpy_core_setup.py.27.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-numpy_tests_test_scripts.py.27.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fcompiler_g95.27.diff
</span> } else {
patchfiles-append patch-numpy_core_setup.py.diff \
patch-numpy_tests_test_scripts.py.diff \
patch-fcompiler_g95.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-numpy_distutils_fcompiler_gnu.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-numpy_distutils_fcompiler_gnu.py.diff
</span> }
compilers.setup -clang -gcc44 -gcc45 \
-gcc46 -gcc47 -gcc48 -g95 clang37
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-f2py_setup.py.diff b/python/py-numpy/files/patch-f2py_setup.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 40ff6b2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-f2py_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,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- numpy/f2py/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ numpy/f2py/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'bdist_rpm')).intersection(sys.argv):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return '#!python'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return '#!' + sys.executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return '#!@@MPORTS_PYTHON@@'
</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;'>- def configuration(parent_package='', top_path=None):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.make_svn_version_py()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def generate_f2py_py(build_dir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- f2py_exe = 'f2py' + os.path.basename(sys.executable)[6:]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f2py_exe = 'f2py'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if f2py_exe[-4:] == '.exe':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f2py_exe = f2py_exe[:-4] + '.py'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-fcompiler_g95.26.diff b/python/py-numpy/files/patch-fcompiler_g95.26.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f200810..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-fcompiler_g95.26.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;'>---- numpy/distutils/fcompiler/__init__.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ numpy/distutils/fcompiler/__init__.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -710,7 +710,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'intele', 'intelem', 'gnu', 'g95', 'pathf95')),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('irix.*', ('mips', 'gnu', 'gnu95',)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('aix.*', ('ibm', 'gnu', 'gnu95',)),
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-fcompiler_g95.34.diff b/python/py-numpy/files/patch-fcompiler_g95.27.diff
</span>similarity index 100%
rename from python/py-numpy/files/patch-fcompiler_g95.34.diff
rename to python/py-numpy/files/patch-fcompiler_g95.27.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_core_setup.py.26.diff b/python/py-numpy/files/patch-numpy_core_setup.py.26.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b341226..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_core_setup.py.26.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- numpy/core/setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ numpy/core/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -460,7 +460,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#endif\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define inline to our keyword, or nothing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_f.write('#ifndef __cplusplus\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -557,7 +564,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#endif\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_f.write("""
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_core_setup.py.34.diff b/python/py-numpy/files/patch-numpy_core_setup.py.27.diff
</span>similarity index 100%
rename from python/py-numpy/files/patch-numpy_core_setup.py.34.diff
rename to python/py-numpy/files/patch-numpy_core_setup.py.27.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.26.diff b/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.26.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a4bbb6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.26.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;'>---- numpy/distutils/fcompiler/gnu.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ numpy/distutils/fcompiler/gnu.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,7 +230,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def runtime_library_dir_option(self, dir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return '-Wl,-rpath="%s"' % dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return '-Wl,-rpath -Wl,"%s"' % dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Gnu95FCompiler(GnuFCompiler):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler_type = 'gnu95'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.26.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.26.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b037fbc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.26.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- numpy/tests/test_scripts.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ numpy/tests/test_scripts.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- major = str(version[0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- minor = str(version[1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor, 'f2py-' + major + '.' + minor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- success = False
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for f2py_cmd in f2py_cmds:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,5 +95,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- msg = "Warning: neither %s nor %s nor %s found in path" % f2py_cmds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ msg = "Warning: none of %s, %s, %s, nor %s found in path" % f2py_cmds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert_(success, msg)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.34.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.27.diff
</span>similarity index 100%
rename from python/py-numpy/files/patch-numpy_tests_test_scripts.py.34.diff
rename to python/py-numpy/files/patch-numpy_tests_test_scripts.py.27.diff
</pre><pre style='margin:0'>
</pre>