Drop reading putative 'depends:' hint

There's never been anything that generates it, apart from internally
from the requires: hint.

7 files changed, 6 insertions, 13 deletions

diff --git a/calm/hint.py b/calm/hint.py
index 8990a25..e76e9e2 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -73,7 +73,6 @@ hintkeys[pvr].update({
     'external-source': 'val',
     'requires': 'optval',
     'obsoletes': 'optval',
-    'depends': 'optval',
     'provides': 'val',
     'conflicts': 'val',
 })
@@ -360,9 +359,6 @@ def hint_file_parse(fn, kind, strict=False):
                 else:
                     hints['build-depends'] = split_trim_sort_join(hints['build-depends'], None, ', ')
 
-            if 'depends' in hints:
-                hints['depends'] = split_trim_sort_join(hints['depends'], ',')
-
             if 'obsoletes' in hints:
                 # obsoletes is specified as comma separated, but cygport writes it space separated at the moment...
                 if ',' in hints['obsoletes']:
diff --git a/calm/package.py b/calm/package.py
index 38a8d70..cec8434 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -166,12 +166,9 @@ def read_hints(p, fn, kind, strict=False):
         for l in hints['parse-warnings']:
             logging.info("package '%s': %s" % (p, l))
 
-    # if we don't have both requires: and depends:, generate the one
-    # from the other
+    # generate depends: from requires:
     if ('requires' in hints) and ('depends' not in hints):
         hints['depends'] = ', '.join(hints['requires'].split())
-    elif ('depends' in hints) and ('requires' not in hints):
-        hints['requires'] = ' '.join([re.sub(r'(.*)\s+\(.*\)', r'\1', d) for d in hints['depends'].split(',')])
 
     return hints
 
diff --git a/test/testdata/hints/noarch/release/test-c/test-c-1.0-1.expected b/test/testdata/hints/noarch/release/test-c/test-c-1.0-1.expected
index c8024d7..ab6b117 100644
--- a/test/testdata/hints/noarch/release/test-c/test-c-1.0-1.expected
+++ b/test/testdata/hints/noarch/release/test-c/test-c-1.0-1.expected
@@ -1,4 +1,4 @@
 {'category': 'Devel',
  'sdesc': '"test package C"',
  'obsoletes': 'obs-a, obs-b',
- 'depends': 'test-d (>= 1.0), test-e'}
+ 'requires': 'test-d test-e'}
diff --git a/test/testdata/htdocs.expected/summary/test-c.html b/test/testdata/htdocs.expected/summary/test-c.html
index 200bd7b..63c827a 100644
--- a/test/testdata/htdocs.expected/summary/test-c.html
+++ b/test/testdata/htdocs.expected/summary/test-c.html
@@ -13,7 +13,7 @@
 <span class="detail">summary</span>: test package C<br><br>
 <span class="detail">description</span>: test package C<br><br>
 <span class="detail">categories</span>: Devel<br><br>
-<span class="detail">depends</span>: <a href="test-d.html">test-d (>= 1.0)</a>, <a href="test-e.html">test-e</a><br><br>
+<span class="detail">depends</span>: <a href="test-d.html">test-d</a>, <a href="test-e.html">test-e</a><br><br>
 <span class="detail">obsoletes</span>: <a href="obs-a.html">obs-a</a>, <a href="obs-b.html">obs-b</a><br><br>
 <span class="detail">source package</span>: <a href="test-c-src.html">test-c</a><br><br>
 <span class="detail">maintainer(s)</span>: ORPHANED 
diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected
index 7c19723..19a18a0 100644
--- a/test/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
@@ -336,7 +336,7 @@
  'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
  'source: noarch/release/test-c/test-c-1.0-1-src.tar.xz 256 '
  'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
- 'depends2: test-d (>= 1.0), test-e\n'
+ 'depends2: test-d, test-e\n'
  'obsoletes: obs-a, obs-b\n'
  '\n'
  '@ test-d\n'
diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index c83b566..c2d2cfc 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -325,7 +325,7 @@
  'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
  'source: noarch/release/test-c/test-c-1.0-1-src.tar.xz 256 '
  'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
- 'depends2: test-d (>= 1.0), test-e\n'
+ 'depends2: test-d, test-e\n'
  'obsoletes: obs-a, obs-b\n'
  '\n'
  '@ test-d\n'
diff --git a/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1.hint b/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1.hint
index 4610d7a..af5eb4b 100755
--- a/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1.hint
+++ b/test/testdata/relarea/noarch/release/test-c/test-c-1.0-1.hint
@@ -1,4 +1,4 @@
 category: Devel
 sdesc: "test package C"
 obsoletes: obs-a obs-b
-depends: test-d (>= 1.0), test-e
+requires: test-d test-e