Fix problem with channel specification being wrongly exported

fixes #62

.gitignore

@@ -94,3 +94,4 @@ ENV/
 
 
 conda_devenv/_version.py
+.pytest_cache

HISTORY.rst

@@ -2,6 +2,15 @@
 History
 =======
 
+1.0.2 (2018-06-07)
+------------------
+
+* Fix problem with channel specification being wrongly exported (`#62`_).
+
+
+.. _`#62`: https://github.com/ESSS/conda-devenv/issues/62
+
+
 1.0.1 (2018-06-04)
 ------------------
 

conda_devenv/devenv.py

@@ -136,8 +136,12 @@ def merge_dependencies_version_specifications(yaml_dict, key_to_merge):
     if value_to_merge is None:
         return
 
-    # regex based on https://conda.io/docs/building/pkg-name-conv.html#package-naming-conventions
-    package_pattern = r'^([a-z0-9_\-.]+)\s*(.*)$'
+    package_pattern = (
+        r'^(?P<channel>[a-z0-9_\-/.]+::)?'
+        # package regex based on https://conda.io/docs/building/pkg-name-conv.html#package-naming-conventions
+        r'(?P<package>[a-z0-9_\-.]+)'
+        r'\s*(?P<version>.*)$'
+    )
 
     new_dependencies = {}
     new_dict_dependencies = []
@@ -151,11 +155,16 @@ def merge_dependencies_version_specifications(yaml_dict, key_to_merge):
             if m is None:
                 raise RuntimeError('The package version specification "{}" do not follow the'
                                    ' expected format.'.format(dep))
+            # Consider the channel name as part of the package name. If multiple channels are specified, the package
+            # will be repeated.
+            package_name = m.group('package')
+            if m.group('channel'):
+                package_name = m.group('channel') + package_name
 
             # OrderedDict is used as an ordered set, the value is ignored.
-            version_matchers = new_dependencies.setdefault(m.group(1), collections.OrderedDict())
-            if len(m.group(2)) > 0:
-                version_matchers[m.group(2)] = True
+            version_matchers = new_dependencies.setdefault(package_name, collections.OrderedDict())
+            if len(m.group('version')) > 0:
+                version_matchers[m.group('version')] = True
         else:
             raise RuntimeError("Only strings and dicts are supported, got: {!r}".format(dep))
 

tests/test_main.py

@@ -72,10 +72,13 @@ def test_print(tmpdir, input_name, capsys):
         name: a
         dependencies:
           - a_dependency
+          - channel::another_dependency ==3.14
     '''))
     assert devenv.main(['--file', str(filename), '--quiet', '--print']) == 0
     out, err = capsys.readouterr()
     assert 'dependencies:' in out
+    assert '- a_dependency' in out
+    assert '- channel::another_dependency ==3.14' in out
     assert 'name: a' in out
 
 
@@ -89,13 +92,16 @@ def test_print_full(tmpdir, capsys):
         name: a
         dependencies:
           - a_dependency
+          - channel::another_dependency ==3.14
         environment:
           PYTHONPATH: {{ root }}/source
     '''))
     assert devenv.main(['--file', str(filename), '--quiet', '--print-full']) == 0
     out, err = capsys.readouterr()
     assert err == ''
     assert 'dependencies:' in out
+    assert '- a_dependency' in out
+    assert '- channel::another_dependency ==3.14' in out
     assert 'name: a' in out
     assert 'environment:' in out
     assert 'PYTHONPATH:' in out