<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-contrib.
</pre>
<p><a href="https://github.com/macports/macports-contrib/commit/37aecab812513171e66b05b745f4f09f15e83656">https://github.com/macports/macports-contrib/commit/37aecab812513171e66b05b745f4f09f15e83656</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 37aecab812513171e66b05b745f4f09f15e83656
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jun 20 17:57:12 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> pypi2port: default to pep517 and py311
</span>---
pypi2port/pypi2port.py | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/pypi2port/pypi2port.py b/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;color:#808080;'>index ffe0429..ab90cb7 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -357,7 +357,7 @@ def is_purepython(pkg_name, pkg_version):
</span> return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_testing(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_testing(name, portv='311'):
</span> """ Port Testing function for various phase implementations """
euid = os.geteuid()
if euid:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -382,7 +382,7 @@ def port_testing(name, portv='38'):
</span> os.execlpe('sudo', *args)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_fetch(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_fetch(name, portv='311'):
</span> """ Fetch phase implementation """
try:
command = "sudo port -t fetch dports/python/py-" + \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,7 +394,7 @@ def port_fetch(name, portv='38'):
</span> return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_checksum(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_checksum(name, portv='311'):
</span> """ Checksum phase implementation """
try:
command = "sudo port -t checksum dports/python/py-" + \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,7 +406,7 @@ def port_checksum(name, portv='38'):
</span> return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_extract(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_extract(name, portv='311'):
</span> """ Checksum phase implementation """
try:
command = "sudo port -t extract dports/python/py-" + \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -418,7 +418,7 @@ def port_extract(name, portv='38'):
</span> return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_patch(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_patch(name, portv='311'):
</span> """ Patch phase implementation """
try:
command = "sudo port -t patch dports/python/py-" + \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,7 +430,7 @@ def port_patch(name, portv='38'):
</span> return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_configure(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_configure(name, portv='311'):
</span> """ Configure phase implementation """
try:
command = "sudo port -t configure dports/python/py-" + \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -442,7 +442,7 @@ def port_configure(name, portv='38'):
</span> return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_build(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_build(name, portv='311'):
</span> """ Build phase implementation """
try:
command = "sudo port -t build dports/python/py-" + \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -454,7 +454,7 @@ def port_build(name, portv='38'):
</span> return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_destroot(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_destroot(name, portv='311'):
</span> """ Destroot phase implementation """
try:
command = "sudo port -t destroot dports/python/py-" + \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -466,7 +466,7 @@ def port_destroot(name, portv='38'):
</span> return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-def port_clean(name, portv='38'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+def port_clean(name, portv='311'):
</span> """ Clean phase implementation """
try:
command = "sudo port -t clean dports/python/py-" + \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -601,16 +601,14 @@ def create_portfile(dict, file_name, dict2):
</span>
python_vers = dict['requires_python']
if python_vers:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file.write('python.versions 38 {0}\n\n'.format(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file.write('python.versions 311 {0}\n'.format(
</span> dict['requires_python']))
else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file.write('python.versions 38\n\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file.write('python.versions 311\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file.write('python.pep517 yes\n\n')
</span>
print("Finding dependencies...")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file.write('if {${name} ne ${subport}} {\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file.write(' depends_build-append \\\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file.write(' ' +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'port:py${python.version}-setuptools\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file.write('if {${name} ne ${subport}} {')
</span> deps = dependencies(dict['name'], dict['version'], True)
if deps:
for i, dep in enumerate(deps):
</pre><pre style='margin:0'>
</pre>