Merge pull request #90 from jayvdb/minreqs-comma

🔨 improve min_requirements template
moremoban · Jul 13, 2019 · 5c14d01 · 5c14d01
2 parents 4281b47 + 63d3e88
commit 5c14d01
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/templates/min_requirements.txt.jj2 b/templates/min_requirements.txt.jj2
@@ -1,7 +1,14 @@
 {% for dependency in dependencies: %}
-{%     if ';' in dependency: %}
-{{dependency.split(';')[0].replace('>=', '==').replace('>', '==') + ';' + dependency.split(';')[1]}}
-{%     else: %}
-{{dependency.replace('>=', '==').replace('>', '==')}}
-{%     endif %}
+{%   if ';' in dependency %}
+{%     set dependency, marker = dependency.split(';') %}
+{%   else %}
+{%     set marker = None %}
+{%   endif %}
+{%   set dependency = dependency.split(',')[0] %}
+{%   set dependency = dependency.replace('>=', '==').replace('>', '==') %}
+{%   if marker %}
+{{dependency + ';' + marker }}
+{%   else: %}
+{{dependency}}
+{%   endif %}
 {% endfor %}