From 8e2b79710039094bf941beb4270013895cf5dd6c Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri, 2 Sep 2022 12:50:01 +0100
Subject: Drop internal uses of requires: hint

Drop all remaining internal uses of requires: hint, use the
(synthesized) depends: hint instead.
---
 calm/package.py                        | 11 ++++++-----
 test/testdata/uploads/pkglist.expected | 14 ++++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/calm/package.py b/calm/package.py
index cec8434..ce88768 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -167,8 +167,9 @@ def read_hints(p, fn, kind, strict=False):
             logging.info("package '%s': %s" % (p, l))
 
     # generate depends: from requires:
-    if ('requires' in hints) and ('depends' not in hints):
-        hints['depends'] = ', '.join(hints['requires'].split())
+    hints['depends'] = ', '.join(hints.get('requires', '').split())
+    # erase requires:, to ensure there is nothing using it
+    hints.pop('requires', None)
 
     return hints
 
@@ -521,7 +522,8 @@ def upgrade_oldstyle_obsoletes(packages):
 
                 if packages[p].tar(vr).is_empty:
                     if '_obsolete' in packages[p].version_hints[vr]['category']:
-                        requires = packages[p].version_hints[vr].get('requires', '').split()
+                        requires = packages[p].version_hints[vr].get('depends', '').split(', ')
+                        requires = [re.sub(r'(.*) +\(.*\)', r'\1', r) for r in requires]
 
                         if p in past_mistakes.old_style_obsolete_by:
                             o = past_mistakes.old_style_obsolete_by[p]
@@ -590,7 +592,6 @@ def validate_packages(args, packages, valid_requires_extra=None, missing_obsolet
 
         for (v, hints) in packages[p].version_hints.items():
             for (c, okmissing, splitchar) in [
-                    ('requires', 'missing-required-package', None),
                     ('depends', 'missing-depended-package', ','),
                     ('obsoletes', 'missing-obsoleted-package', ',')
             ]:
@@ -605,7 +606,7 @@ def validate_packages(args, packages, valid_requires_extra=None, missing_obsolet
                         if splitchar:
                             r = re.sub(r'(.*) +\(.*\)', r'\1', r)
 
-                        if c == 'requires':
+                        if c == 'depends':
                             # don't count cygwin-debuginfo for the purpose of
                             # checking if this package has any requires, as
                             # cygport always makes debuginfo packages require
diff --git a/test/testdata/uploads/pkglist.expected b/test/testdata/uploads/pkglist.expected
index ae70bb4..538f40f 100644
--- a/test/testdata/uploads/pkglist.expected
+++ b/test/testdata/uploads/pkglist.expected
@@ -4,7 +4,6 @@
                     'Like it’s you’re Markup Language™ Nokogiri’s tool―that '
                     'Bézier."',
            'category': 'Devel',
-           'requires': 'cygwin',
            'depends': 'cygwin'}}, {}, False),
  'testpackage-src': Package('testpackage', {'1.0-1': Tar('testpackage-1.0-1-src.tar.bz2', 'x86/release/testpackage', 'acfd77df3347e6432ccf29c12989964bc680a158d574f85dfa7ef222759f411006c7bd2773e37c5abdee628bea769b2da9aae213db615cd91402fd385373933d', 266, False)}, {'1.0-1': {'sdesc': '"A test package"',
            'ldesc': '"A test package\n'
@@ -13,13 +12,14 @@
                     'Bézier."',
            'category': 'Devel',
            'homepage': 'http://homepage.url',
-           'parse-warnings': ["key 'license' missing"]}}, {}, False),
+           'parse-warnings': ["key 'license' missing"],
+           'depends': ''}}, {}, False),
  'testpackage-subpackage': Package('testpackage/testpackage-subpackage', {'1.0-1': Tar('testpackage-subpackage-1.0-1.tar.bz2', 'x86/release/testpackage/testpackage-subpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}, {'1.0-1': {'sdesc': '"A test subpackage"',
            'ldesc': '"A test subpackage"',
            'category': 'Devel',
-           'external-source': 'testpackage-src'}}, {}, False),
+           'external-source': 'testpackage-src',
+           'depends': ''}}, {}, False),
  'testpackage-zstd': Package('testpackage-zstd', {'1.0-1': Tar('testpackage-zstd-1.0-1.tar.zst', 'x86/release/testpackage-zstd', '044066c54c036190f9b0496ccf31f74748d209cce961352e19631876d5abd79ef6d2b34edfb955b8d1a7a781294ee0636bb1305afe410b34562367a2cb77988d', 98, False)}, {'1.0-1': {'category': 'Base',
-           'requires': '',
            'sdesc': '"test package (zstd compressed)"',
            'ldesc': '"test package (zstd compressed)"',
            'depends': ''}}, {}, False),
@@ -29,7 +29,9 @@
            'ldesc': '"test package (zstd compressed)"',
            'homepage': 'http://zstd.testpkg.invalid',
            'skip': '',
-           'parse-warnings': ["key 'license' missing"]}}, {}, False),
+           'parse-warnings': ["key 'license' missing"],
+           'depends': ''}}, {}, False),
  'testpackage2-subpackage': Package('testpackage2/testpackage2-subpackage', {'1.0-1': Tar('testpackage2-subpackage-1.0-1.tar.bz2', 'x86/release/testpackage2/testpackage2-subpackage', 'c4bf8e28d71b532e2b741e2931906dec0f0a70d4d051c0503476f864a5228f43765ae3342aafcebfd5a1738073537726b2bfbbd89c6da939a5f46d95aca3feaf', 46, True)}, {'1.0-1': {'sdesc': '"A test subpackage 2"',
            'ldesc': '"A test subpackage 2"',
-           'category': 'Devel'}}, {}, False)}
+           'category': 'Devel',
+           'depends': ''}}, {}, False)}
-- 
cgit v1.2.3