Change python naming convention

macports · Jun 22, 2019 · 13cd9fd · 13cd9fd
1 parent 8c08181
commit 13cd9fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/upt_macports/templates/python.Portfile b/upt_macports/templates/python.Portfile
@@ -5,6 +5,9 @@ PortGroup           python 1.0
 {% endblock %}
 {% block nameversion %}
 name                {{ pkg._pkgname() }}
+{% if pkg._python_root_name() %}
+python.rootname     {{ pkg._python_root_name() }}
+{% endif %}
 version             {{ pkg.upt_pkg.version }}
 revision            0
 {% endblock %}

diff --git a/upt_macports/tests/test_python_package.py b/upt_macports/tests/test_python_package.py
@@ -11,7 +11,7 @@ def setUp(self):
         self.package.upt_pkg = upt.Package('test-pkg', '13.37')
 
     def test_pkgname(self):
-        expected = ['py-foo', 'py-py-foo', 'py-pyfoo', 'py-pyFoo']
+        expected = ['py-foo', 'py-py-foo', 'py-pyfoo', 'py-pyfoo']
         names = ['foo', 'py-foo', 'pyfoo', 'pyFoo']
         for (name, expected_name) in zip(names, expected):
             self.package.upt_pkg = upt.Package(name, '13.37')

diff --git a/upt_macports/upt_macports.py b/upt_macports/upt_macports.py
@@ -97,8 +97,14 @@ def _pkgname(self):
 
     @staticmethod
     def _normalized_macports_name(name):
+        name = name.lower()
         return f'py-{name}'
 
+    def _python_root_name(self):
+        pypi_name = self.upt_pkg.get_archive().filename.split('-'+self.upt_pkg.version)[0] # noqa
+        if pypi_name != self.upt_pkg.name.lower():
+            return pypi_name
+
 
 class MacPortsNpmPackage(MacPortsPackage):
     template = 'npm.Portfile'