<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository upt-macports.
</pre>
<p><a href="https://github.com/macports/upt-macports/commit/b9d91359fdc29c78b03eb58c5203bbf805eca619">https://github.com/macports/upt-macports/commit/b9d91359fdc29c78b03eb58c5203bbf805eca619</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b9d91359fdc29c78b03eb58c5203bbf805eca619
</span>Author: Korusuke <karan.sheth@somaiya.edu>
AuthorDate: Mon Apr 1 00:54:37 2019 +0530
<span style='display:block; white-space:pre;color:#404040;'> Add checksums and improve support for PyPI frontend
</span>---
upt_macports/templates/python.Portfile | 23 +++++++++++++++++------
upt_macports/upt_macports.py | 23 ++++++++++++++++++++---
2 files changed, 37 insertions(+), 9 deletions(-)
<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 685b0dd..b34892c 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;'>@@ -1,9 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{% extends 'base.Portfile' %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{% block portgroup %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span> PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{% endblock %}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{% block versions %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name py-{{ pkg._pkgname() }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version {{ pkg.upt_pkg.version }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description {{ pkg.upt_pkg.summary }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 {{ pkg.upt_pkg.archives[0].md5 }} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 {{ pkg.upt_pkg.archives[0].sha256 }} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 {{ pkg.upt_pkg.archives[0].rmd160 }} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size {{ pkg.upt_pkg.archives[0].size }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> python.versions 27 36 37
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{% endblock %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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 f10cfdc..fcaa3cb 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;'>@@ -1,6 +1,6 @@
</span> import upt
import logging
<span style='display:block; white-space:pre;background:#ffe0e0;'>-import jinja2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+import jinja2
</span>
class MacPortsPackage(object):
def __init__(self):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +24,10 @@ class MacPortsPackage(object):
</span> lstrip_blocks=True,
keep_trailing_newline=True,
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #env.filters['reqformat'] = self.jinja2_reqformat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # env.filters['reqformat'] = self.jinja2_reqformat
</span> template = env.get_template(self.template)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ print(template)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print(self)
</span> return template.render(pkg=self)
def _depends(self, phase):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +56,7 @@ class MacPortsPythonPackage(MacPortsPackage):
</span> def _normalized_macports_name(name):
name = name.lower()
return f'py-{name}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # if name == 'py':
# return 'py-py'
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,12 +68,25 @@ class MacPortsPythonPackage(MacPortsPackage):
</span> # name = name[2:]
# return f'py-{name}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> class MacPortsPerlPackage(MacPortsPackage):
template = 'perl.Portfile'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _pkgname(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports_name = self._normalized_macports_name(self.upt_pkg.name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return f'{macports_name}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @staticmethod
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def _normalized_macports_name(name):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = name # for perl changing to lower case may cause error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return f'{name}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> class MacPortsRubyPackage(MacPortsPackage):
template = 'ruby.Portfile'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> class MacportsBackend(upt.Backend):
name = 'macports'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +94,8 @@ class MacportsBackend(upt.Backend):
</span> pkg_classes = {
'pypi': MacPortsPythonPackage,
'cpan': MacPortsPerlPackage,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'rubygems': MacPortsRubyPackage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'rubygems': MacPortsRubyPackage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
try:
</pre><pre style='margin:0'>
</pre>