<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/f4c75f96b9137a257062d5e07466d371ff46e974">https://github.com/macports/macports-contrib/commit/f4c75f96b9137a257062d5e07466d371ff46e974</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f4c75f96b9137a257062d5e07466d371ff46e974
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jun 20 17:40:11 2023 +1000

<span style='display:block; white-space:pre;color:#404040;'>    pypi2port: remove portfile options that are now redundant
</span>---
 pypi2port/pypi2port.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 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 7232ea6..a53b659 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;'>@@ -571,9 +571,7 @@ def create_portfile(dict, file_name, dict2):
</span>                           zip_set = False
 
                if master_site:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        if re.match(r'^https?://files\.pythonhosted\.org/packages/', master_site):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            file.write('master_sites        pypi:{0}/{1}\n'.format(dict['name'][0], dict['name']))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        if not re.match(r'^https?://files\.pythonhosted\.org/packages/', master_site):
</span>                             file.write('master_sites        {0}\n'.format(master_site))
                         master_site_exists = True
                else:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -583,8 +581,6 @@ def create_portfile(dict, file_name, dict2):
</span>                   file.write('use_zip             yes\n')
                        file.write('extract.mkdir       yes\n')
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                file.write('distname            {0}-${{version}}\n\n'.format(dict['name']))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>           print(("Attempting to generate checksums for " + dict['name'] + "..."))
                checksums_values = checksums(dict['name'], dict['version'])
                if checksums_values:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -642,12 +638,7 @@ def create_portfile(dict, file_name, dict2):
</span>                           file.write("\n")
                file.write('\n')
                file.write('    livecheck.type      none\n')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                if master_site_exists:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   file.write('} else {\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   file.write('    livecheck.type      pypi\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   file.write('}\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   file.write('}\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           file.write('}\n')
</span>   print("Searching for existent port...")
        port_exists = search_port(dict['name'])
        if port_exists:
</pre><pre style='margin:0'>

</pre>