Merge pull request #87 from siddhpant/pipfile-syntax-fix

Fixed the Pipfile generation syntax and added tests

Author: chfw

CHANGELOG.rst

@@ -1,6 +1,19 @@
 Change log
 ================================================================================
 
+0.0.6 - 25-05-2019
+--------------------------------------------------------------------------------
+
+Updated
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. #87: updated the pipfile syntax
+
+Added
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. #87: Added tests for pipfile generation
+
 0.0.5 - 04-05-2019
 --------------------------------------------------------------------------------
 

changelog.yml

@@ -1,6 +1,15 @@
 name: "pypi-mobans"
 organisation: moremoban
 releases:
+- changes:
+  - action: Updated
+    details:
+    - "#87: updated the pipfile syntax"
+  - action: Added
+    details:
+    - "#87: Added tests for pipfile generation"
+  date: 25-05-2019
+  version: 0.0.6
 - changes:
   - action: Updated
     details:

templates/Pipfile.jj2

@@ -8,9 +8,23 @@ python_version= '3.6'
 
 [packages]
 {% for dependency in dependencies: %}
-  {% if ('=' in dependency) or ('>' in dependency) or ('<' in dependency) %}
-    {{dependency}}
-  {% else %}
+  {% if ('>' in dependency) %}
+    {%- with dep, ver = dependency.split('>') -%}
+      {{dep}} = '>{{ver}}'
+    {% endwith %}
+  {% elif ('<' in dependency) %}
+    {%- with dep, ver = dependency.split('<') -%}
+      {{dep}} = '<{{ver}}'
+    {% endwith %}
+  {% elif ('~' in dependency) %}
+    {%- with dep, ver = dependency.split('~') -%}
+      {{dep}} = '~{{ver}}'
+    {% endwith %}
+  {% elif ('=' in dependency) %}
+    {%- with dep, ver = dependency.split('=', 1) -%}
+      {{dep}} = '={{ver}}'
+    {% endwith %}
+  {%- else -%}
     {{dependency}} = "*"
   {% endif %}
 {% endfor %}
@@ -23,10 +37,24 @@ coverage = "*"
 flake8 = "*"
 {% if dev_dependencies is defined %}
   {% for dependency in dev_dependencies: %}
-    {% if ('=' in dependency) or ('>' in dependency) or ('<' in dependency) %}
-      {{dependency}}
-    {% else %}
+    {% if ('>' in dependency) %}
+      {%- with dep, ver = dependency.split('>') -%}
+        {{dep}} = '>{{ver}}'
+      {% endwith %}
+    {% elif ('<' in dependency) %}
+      {%- with dep, ver = dependency.split('<') -%}
+        {{dep}} = '<{{ver}}'
+      {% endwith %}
+    {% elif ('~' in dependency) %}
+      {%- with dep, ver = dependency.split('~') -%}
+        {{dep}} = '~{{ver}}'
+      {% endwith %}
+    {% elif ('=' in dependency) %}
+      {%- with dep, ver = dependency.split('=', 1) -%}
+        {{dep}} = '={{ver}}'
+      {% endwith %}
+    {%- else -%}
       {{dependency}} = "*"
-    {% endif %}
-  {% endfor %}
+    {% endif %}  
+  {%- endfor %}
 {% endif %}

tests/test_pipfile.py

@@ -0,0 +1,69 @@
+import textwrap
+
+from test_utils import get_rendered_file
+
+
+def test_pipfile():
+    context = {
+        'dependencies': [
+                'dependency',
+                'dependency=1.0',
+                'dependency==1.0',
+                'dependency>1.0',
+                'dependency>=1.0',
+                'dependency<1.0',
+                'dependency<=1.0',
+                'dependency~1.0',
+                'dependency~=1.0'
+        ],
+        'dev_dependencies': [
+                'dev_dependency',
+                'dev_dependency=1.0',
+                'dev_dependency==1.0',
+                'dev_dependency>1.0',
+                'dev_dependency>=1.0',
+                'dev_dependency<1.0',
+                'dev_dependency<=1.0',
+                'dev_dependency~1.0',
+                'dev_dependency~=1.0'
+        ]
+    }
+    filename = 'Pipfile.jj2'
+    rendered = get_rendered_file(filename, context)
+    expected_pipfile = textwrap.dedent("""\
+           [[source]]
+           url = 'https://pypi.python.org/simple'
+           verify_ssl = true
+           name = 'pypi'
+
+           [requires]
+           python_version= '3.6'
+
+           [packages]
+           dependency = "*"
+           dependency = '=1.0'
+           dependency = '==1.0'
+           dependency = '>1.0'
+           dependency = '>=1.0'
+           dependency = '<1.0'
+           dependency = '<=1.0'
+           dependency = '~1.0'
+           dependency = '~=1.0'
+
+           [dev-packages]
+           nose = "*"
+           mock = "*"
+           codecov = "*"
+           coverage = "*"
+           flake8 = "*"
+           dev_dependency = "*"
+           dev_dependency = '=1.0'
+           dev_dependency = '==1.0'
+           dev_dependency = '>1.0'
+           dev_dependency = '>=1.0'
+           dev_dependency = '<1.0'
+           dev_dependency = '<=1.0'
+           dev_dependency = '~1.0'
+           dev_dependency = '~=1.0'
+    """)
+    assert expected_pipfile == rendered