<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/65272b349b3484e846842205f57ed82fc3295be1">https://github.com/macports/upt-macports/commit/65272b349b3484e846842205f57ed82fc3295be1</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 65272b3  Update _python_root_name function
</span>65272b3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 65272b349b3484e846842205f57ed82fc3295be1
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Jun 7 15:35:55 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    Update _python_root_name function
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    The latest version of upt-pypi (v0.5.1) returns the proper
</span><span style='display:block; white-space:pre;color:#404040;'>    capitalization of the PyPI package name. So there is no need anymore to
</span><span style='display:block; white-space:pre;color:#404040;'>    reconstruct this ourselves from the archive filename.
</span>---
 upt_macports/tests/test_python_package.py | 21 +++++----------------
 upt_macports/upt_macports.py              |  6 +++---
 2 files changed, 8 insertions(+), 19 deletions(-)

<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 80cefe6..29e5cb1 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;'>@@ -25,23 +25,12 @@ class TestMacPortsPythonPackage(unittest.TestCase):
</span>                 self.package._normalized_macports_folder(name), expected_name)
 
     def test_py_root_name(self):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        url_names = ['foo', 'Foo', 'Foo', 'foo']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        pypi_names = ['foo', 'foo', 'pyFoo', 'py-Foo']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        urls = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            'https://fakepypi.com/random/path/foo-13.37.tar.gz',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            'https://fakepypi.com/random/path/Foo-13.37.tar.gz',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            'https://fakepypi.com/random/path/Foo-13.37.tar.gz',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            'https://fakepypi.com/random/path/foo-13.37.tar.gz'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        for (url_name, pypi_name, url) in zip(url_names, pypi_names, urls):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        pypi_names = ['foo', 'Foo', 'pyFoo', 'pyfoo', 'py-Foo']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        expected_python_rootnames = [None, 'Foo', 'pyFoo', None, 'py-Foo']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        for (pypi_name, python_rootname) in zip(pypi_names,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                                expected_python_rootnames):
</span>             self.package.upt_pkg = upt.Package(pypi_name, '13.37')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            self.package.upt_pkg.archives = [upt.Archive(url)]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if url_name != pypi_name:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                self.assertEqual(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    self.package._python_root_name(), url_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                self.assertEqual(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    self.package._python_root_name(), None)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            self.assertEqual(self.package._python_root_name(), python_rootname)
</span> 
     def test_jinja2_reqformat(self):
         req = upt.PackageRequirement('Require')
<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 0044ab4..8b62caf 100755
</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;'>@@ -139,9 +139,9 @@ class MacPortsPythonPackage(MacPortsPackage):
</span>         return f'py-{name}'
 
     def _python_root_name(self):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        pypi_name = self.upt_pkg.get_archive().filename.split('-'+self.upt_pkg.version)[0] # noqa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if pypi_name != self.upt_pkg.name.lower():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            return pypi_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        """Return PyPI name if different than MacPorts naming convention."""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if self.upt_pkg.name != self.upt_pkg.name.lower():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            return self.upt_pkg.name
</span> 
     @staticmethod
     def _normalized_macports_folder(name):
</pre><pre style='margin:0'>

</pre>