<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/5c29d2e09efb7836c79f079a9fb2755789141e2e">https://github.com/macports/upt-macports/commit/5c29d2e09efb7836c79f079a9fb2755789141e2e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5c29d2e09efb7836c79f079a9fb2755789141e2e
</span>Author: Korusuke <karan.sheth@somaiya.edu>
AuthorDate: Sun Apr 7 04:53:43 2019 +0530
<span style='display:block; white-space:pre;color:#404040;'> Modularise templates and remove unwanted statements
</span>---
upt_macports/templates/base.Portfile | 21 ++++++++--------
upt_macports/templates/npm.Portfile | 20 ++++------------
upt_macports/templates/perl.Portfile | 32 +++++++++----------------
upt_macports/templates/python.Portfile | 44 +++++++++++++++++++++++-----------
upt_macports/upt_macports.py | 16 +++++--------
5 files changed, 62 insertions(+), 71 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/templates/base.Portfile b/upt_macports/templates/base.Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9928be5..cf36f7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/templates/base.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/templates/base.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,24 +5,23 @@ PortSystem 1.0
</span> {% endblock %}
{% block nameversion %}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name {{ pkg._pkgname() }}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version {{ pkg.upt_pkg.version }}
</span> {% endblock %}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> maintainers nomaintainer
description {{ pkg.upt_pkg.summary }}
long_description ${description}
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{% block versions %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block dist_info %}
</span> {% endblock %}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{% block build_deps %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{{ depends_build-append pkg.build_depends }}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{% endblock %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{% block run_deps %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{{ depends_run-append pkg.run_depends }}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{% endblock %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{% block test_deps %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{{ depends('TEST', pkg.test_depends) }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {% for i in pkg.upt_pkg.licenses %}{{i.name}}{% endfor %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block versions %}
</span> {% endblock %}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/templates/npm.Portfile b/upt_macports/templates/npm.Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ce71c8..0191c99 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/templates/npm.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/templates/npm.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% extends 'base.Portfile' %}
</span>
{% block nameversion %}
name npm-{{ pkg._pkgname() }}
version {{ pkg.upt_pkg.version }}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{% endblock %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories npm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description {{ pkg.upt_pkg.summary }}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license {{ pkg.upt_pkg.licenses }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block dist_info %}
</span> homepage {{ pkg.upt_pkg.homepage }}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> distname {{ pkg._pkgname() }}-{{ pkg.upt_pkg.version }}
distfiles {{ pkg._pkgname() }}-{{ pkg.upt_pkg.version }}.tgz
master_sites {{ pkg.upt_pkg.archives[0].url }}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 {{ pkg.upt_pkg.archives[0].md5 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 {{ pkg.upt_pkg.archives[0].sha256 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 {{ pkg.upt_pkg.archives[0].rmd160 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size {{ pkg.upt_pkg.archives[0].size }}
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/templates/perl.Portfile b/upt_macports/templates/perl.Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 89fbaf1..c7d64e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/templates/perl.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/templates/perl.Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup perl5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% extends 'base.Portfile' %}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block portgroup %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup perl5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block nameversion %}
</span> perl5.branches 5.26 5.28
perl5.setup {{ pkg._pkgname() }} {{ pkg.upt_pkg.version }}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license {% for i in pkg.upt_pkg.licenses %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{{ i.spdx_identifier }} {% if loop.index != pkg.upt_pkg.licenses|length %}\{% endif %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{% endfor %}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description {{ pkg.upt_pkg.summary }}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 {{ pkg.upt_pkg.archives[0].md5 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 {{ pkg.upt_pkg.archives[0].sha256 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 {{ pkg.upt_pkg.archives[0].rmd160 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size {{ pkg.upt_pkg.archives[0].size }}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block versions %}
</span> if {${perl5.major} != ""} {
depends_lib-append \
{% for i in pkg.upt_pkg.requirements.run %}
port:p${perl5.major}-{{i.name|replace('::','-')|lower}} {% if loop.index != pkg.upt_pkg.requirements.run|length %}\{% endif %}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> {% endfor %}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><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 b34892c..1040909 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,20 +1,36 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% extends 'base.Portfile' %}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name py-{{ pkg._pkgname() }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block portgroup %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block nameversion %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name {{ pkg._pkgname() }}
</span> version {{ pkg.upt_pkg.version }}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block dist_info %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage {{ pkg.upt_pkg.homepage }}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% block versions %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 37
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description {{ pkg.upt_pkg.summary }}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% if pkg.upt_pkg.requirements.run|length > 0 %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% for i in pkg.upt_pkg.requirements.run %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-{{i.name}} {% if not loop.last %}\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endif %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endfor %}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {% endif %}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 {{ pkg.upt_pkg.archives[0].md5 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 {{ pkg.upt_pkg.archives[0].sha256 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 {{ pkg.upt_pkg.archives[0].rmd160 }} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size {{ pkg.upt_pkg.archives[0].size }}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{% endblock %}
</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 6f4e0f3..1f5c68e 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;'>@@ -14,7 +14,7 @@ class MacPortsPackage(object):
</span> self.logger.info(f'Hello, creating the package')
print(self._render_makefile_template())
print(self._depends)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # self.name, self.specifier
def _render_makefile_template(self):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,8 +26,6 @@ class MacPortsPackage(object):
</span> )
# env.filters['reqformat'] = self.jinja2_reqformat
template = env.get_template(self.template)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- print(template)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print(self)
</span> return template.render(pkg=self)
def _depends(self, phase):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +54,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:#ffe0e0;'>-
</span><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;'>@@ -86,18 +84,16 @@ class MacPortsPerlPackage(MacPortsPackage):
</span>
def _pkgname(self):
macports_name = self._normalized_macports_name(self.upt_pkg.name)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return f'{macports_name}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return macports_name
</span>
@staticmethod
def _normalized_macports_name(name):
name = name # for perl changing to lower case may cause error
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return f'{name}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return name
</span>
class MacPortsRubyPackage(MacPortsPackage):
template = 'ruby.Portfile'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> class MacportsBackend(upt.Backend):
name = 'macports'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +102,7 @@ class MacportsBackend(upt.Backend):
</span> 'pypi': MacPortsPythonPackage,
'cpan': MacPortsPerlPackage,
'rubygems': MacPortsRubyPackage,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'npm': MacPortsNpmPackage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'npm': MacPortsNpmPackage
</span> }
try:
</pre><pre style='margin:0'>
</pre>