<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1117dd828727833975d40d9b576064f44209b7ea">https://github.com/macports/macports-ports/commit/1117dd828727833975d40d9b576064f44209b7ea</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 1117dd82872 py-python-install: fix data dir handling bugs
</span>1117dd82872 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1117dd828727833975d40d9b576064f44209b7ea
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jul 27 07:03:40 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> py-python-install: fix data dir handling bugs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Allows installation of e.g. docutils.
</span>---
python/py-python-install/Portfile | 3 +-
.../files/patch-install-__init__.py.diff | 41 ++++++++++++++++++----
2 files changed, 36 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-install/Portfile b/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21728adccb9..08917ac44b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup python 1.0
</span>
name py-python-install
version 0.0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> supported_archs noarch
maintainers {jmr @jmroot} openmaintainer
license MIT
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-install/files/patch-install-__init__.py.diff b/python/py-python-install/files/patch-install-__init__.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6dda4fdb612..7a1f6fe04bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-install/files/patch-install-__init__.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-install/files/patch-install-__init__.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install/__init__.py.orig 2021-03-27 19:03:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install/__init__.py 2021-03-27 19:08:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- install/__init__.py.orig 2020-11-30 08:53:24.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ install/__init__.py 2022-07-27 06:59:19.000000000 +1000
</span> @@ -84,6 +84,8 @@
else:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +9,20 @@
</span> from distutils.dir_util import copy_tree
for node in os.listdir(src):
if node in ignore:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- install/__init__.py.orig 2021-10-28 17:53:51.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install/__init__.py 2021-10-28 17:54:43.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,6 +133,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,11 +118,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _replace_shebang(dir, interpreter): # type: (str, str) -> None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- scripts = [os.path.join(dir, script) for script in os.listdir(dir)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for script in scripts:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if not os.path.isfile(script):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- raise InstallException('Script is not a file: {}'.format(script))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ scripts = [script for script in [os.path.join(dir, f) for f in os.listdir(dir)] if os.path.isfile(script)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python 2 does not support fileinput as a contex manager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f = fileinput.input(scripts, inplace=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,6 +129,17 @@
</span> f.close()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +40,7 @@
</span> def _check_requirement(requirement_string): # type: (str) -> bool
import packaging.requirements
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -240,9 +251,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,9 +247,12 @@
</span>
if os.path.isfile(entrypoints_file):
_generate_entrypoint_scripts(entrypoints_file, scripts_cache_dir)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,3 +53,21 @@
</span>
_save_pickle(cache_dir, 'wheel-info', wheel_info)
_save_pickle(cache_dir, 'metadata', metadata)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,7 +270,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_cache_dir = os.path.join(cache_dir, 'pkg')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts_cache_dir = os.path.join(cache_dir, 'scripts')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_data_dir_name = '{}-{}.data'.format(wheel_info['distribution'], wheel_info['version'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pkg_data_dir = os.path.join(cache_dir, pkg_data_dir_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_data_dir = os.path.join(pkg_cache_dir, pkg_data_dir_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_dir = destdir_path('purelib' if metadata['Root-Is-Purelib'] == 'true' else 'platlib')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -269,7 +281,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _copy_dir(target, destdir_path(lib))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.path.isdir(pkg_data_dir):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for node in os.listdir(pkg_data_dir):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target = os.path.join(pkg_cache_dir, node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target = os.path.join(pkg_data_dir, node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if node == 'purelib':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _copy_dir(target, destdir_path('purelib'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if node == 'platlib':
</span></pre><pre style='margin:0'>
</pre>