<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository upt-macports.
</pre>
<p><a href="https://github.com/macports/upt-macports/commit/13cd9fd87fb5a1e34ad007499eef361352273bca">https://github.com/macports/upt-macports/commit/13cd9fd87fb5a1e34ad007499eef361352273bca</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 13cd9fd Change python naming convention
</span>13cd9fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 13cd9fd87fb5a1e34ad007499eef361352273bca
</span>Author: Karan Sheth <karan.sheth@somaiya.edu>
AuthorDate: Tue Jun 18 01:11:11 2019 +0530
<span style='display:block; white-space:pre;color:#404040;'> Change python naming convention
</span>---
upt_macports/templates/python.Portfile | 3 +++
upt_macports/tests/test_python_package.py | 2 +-
upt_macports/upt_macports.py | 6 ++++++
3 files changed, 10 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/templates/python.Portfile b/upt_macports/templates/python.Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b07dcaf..27fbfcd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/templates/python.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/templates/python.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,9 @@ PortGroup python 1.0
</span> {% endblock %}
{% block nameversion %}
name {{ pkg._pkgname() }}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+{% if pkg._python_root_name() %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.rootname {{ pkg._python_root_name() }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endif %}
</span> version {{ pkg.upt_pkg.version }}
revision 0
{% endblock %}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/tests/test_python_package.py b/upt_macports/tests/test_python_package.py
</span><span style='display:block; white-space:pre;color:#808080;'>index fe15fa5..3639af9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/tests/test_python_package.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/tests/test_python_package.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ class TestMacPortsPythonPackage(unittest.TestCase):
</span> self.package.upt_pkg = upt.Package('test-pkg', '13.37')
def test_pkgname(self):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- expected = ['py-foo', 'py-py-foo', 'py-pyfoo', 'py-pyFoo']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ expected = ['py-foo', 'py-py-foo', 'py-pyfoo', 'py-pyfoo']
</span> names = ['foo', 'py-foo', 'pyfoo', 'pyFoo']
for (name, expected_name) in zip(names, expected):
self.package.upt_pkg = upt.Package(name, '13.37')
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/upt_macports.py b/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;color:#808080;'>index b5bc500..55cf2db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/upt_macports.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,8 +97,14 @@ class MacPortsPythonPackage(MacPortsPackage):
</span>
@staticmethod
def _normalized_macports_name(name):
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = name.lower()
</span> return f'py-{name}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _python_root_name(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pypi_name = self.upt_pkg.get_archive().filename.split('-'+self.upt_pkg.version)[0] # noqa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if pypi_name != self.upt_pkg.name.lower():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return pypi_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
class MacPortsNpmPackage(MacPortsPackage):
template = 'npm.Portfile'
</pre><pre style='margin:0'>
</pre>