Drop generating requires: header

For setup versions later than 2.885, it's superseded by depends2:

Dropping this reduces the size of setup.ini by about 5%

3 files changed, 1 insertions, 31 deletions

diff --git a/calm/package.py b/calm/package.py
index dd137fb..38a8d70 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -1071,15 +1071,6 @@ def write_setup_ini(args, packages, arch):
             category = ' '.join(map(upper_first_character, category.split()))
             print("category: %s" % category, file=f)
 
-            # compute the union of requires for all versions
-            requires = set()
-            for hints in po.version_hints.values():
-                if 'requires' in hints:
-                    requires = set.union(requires, hints['requires'].split())
-            # empty requires are suppressed as setup's parser can't handle that
-            if requires:
-                print("requires: %s" % ' '.join(sorted(requires)), file=f)
-
             if 'message' in po.version_hints[bv]:
                 print("message: %s" % po.version_hints[bv]['message'], file=f)
 
@@ -1189,7 +1180,7 @@ def write_setup_ini(args, packages, arch):
                 # also itself emitted.
 
                 if version in po.versions():
-                    if hints.get('depends', '') or requires:
+                    if hints.get('depends', ''):
                         print("depends2: %s" % hints.get('depends', ''), file=f)
 
                     if hints.get('obsoletes', ''):
diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected
index d3b7f23..7c19723 100644
--- a/test/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
@@ -31,7 +31,6 @@
  'sdesc: "Initial base installation helper script"\n'
  'ldesc: "Initial base installation helper script."\n'
  'category: Base\n'
- 'requires: cygwin-api0_291\n'
  'version: 3.8-1\n'
  'install: x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -40,7 +39,6 @@
  'version: 3.6-1\n'
  'install: x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends2: \n'
  '\n'
  '@ corrupt\n'
  'sdesc: "A corrupt package"\n'
@@ -56,7 +54,6 @@
  'sdesc: "The UNIX emulation engine"\n'
  'ldesc: "The UNIX emulation engine"\n'
  'category: Base\n'
- 'requires: base-cygwin\n'
  'version: 2.2.1-1\n'
  'install: x86/release/cygwin/cygwin-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -85,7 +82,6 @@
  'ldesc: "This package contains files necessary for debugging the\n'
  'cygwin package with gdb."\n'
  'category: Debug\n'
- 'requires: cygwin-debuginfo\n'
  'version: 2.2.1-1\n'
  'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -141,7 +137,6 @@
  'ssh-agent, otherwise it loads them, prompting you for a password if\n'
  'necessary"\n'
  'category: Utils\n'
- 'requires: openssh\n'
  'version: 2.7.1-1\n'
  'install: x86/release/keychain/keychain-2.7.1-1.tar.bz2 32219 '
  '0c7b7ad2636b6e23e40e8cb593196b3fabe9c44f7618ea9b2021b89ecdc08720a7f824be0beaa75c9e62dda9a7b5ed7e9c1ed147a1875c582e80866ad09533a2\n'
@@ -162,7 +157,6 @@
  'automatic discovery of computers, devices, and services on IP networks using\n'
  'industry standard IP protocols."\n'
  'category: Net\n'
- 'requires: libdns_sd1\n'
  'version: 379.32.1-1\n'
  'install: x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
@@ -188,7 +182,6 @@
  'automatic discovery of computers, devices, and services on IP networks using\n'
  'industry standard IP protocols."\n'
  'category: Net\n'
- 'requires: libdns_sd1\n'
  'message: mDNSResponder "The Cygwin mDNSResponder package contains only clients.\n'
  "If you do not already have the 'Bonjour Service' installed (it comes with\n"
  'a number of popular Windows programs), then you can download it at\n'
@@ -234,7 +227,6 @@
  'sdesc: "Per-version hint test package"\n'
  'ldesc: "Per-version hint test package"\n'
  'category: Base\n'
- 'requires: base-cygwin cygwin\n'
  'version: 4.8-1\n'
  'install: x86/release/per-version/per-version-4.8-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -253,7 +245,6 @@
  'sdesc: "Per-version hint test package"\n'
  'ldesc: "Per-version hint test package"\n'
  'category: Base\n'
- 'requires: cygwin\n'
  'version: 1.0-1\n'
  'install: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -340,7 +331,6 @@
  '@ test-c\n'
  'sdesc: "test package C"\n'
  'category: Devel Unmaintained\n'
- 'requires: test-d test-e\n'
  'version: 1.0-1\n'
  'install: noarch/release/test-c/test-c-1.0-1.tar.xz 256 '
  'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index d620250..c83b566 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -31,7 +31,6 @@
  'sdesc: "Initial base installation helper script"\n'
  'ldesc: "Initial base installation helper script."\n'
  'category: Base\n'
- 'requires: cygwin-api0_291\n'
  'version: 3.8-1\n'
  'install: x86/release/base-cygwin/base-cygwin-3.8-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -40,7 +39,6 @@
  'version: 3.6-1\n'
  'install: x86/release/base-cygwin/base-cygwin-3.6-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends2: \n'
  '\n'
  '@ corrupt\n'
  'sdesc: "A corrupt package"\n'
@@ -56,7 +54,6 @@
  'sdesc: "The UNIX emulation engine"\n'
  'ldesc: "The UNIX emulation engine"\n'
  'category: Base\n'
- 'requires: base-cygwin\n'
  'version: 2.2.1-1\n'
  'install: x86/release/cygwin/cygwin-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -85,7 +82,6 @@
  'ldesc: "This package contains files necessary for debugging the\n'
  'cygwin package with gdb."\n'
  'category: Debug\n'
- 'requires: cygwin-debuginfo\n'
  'version: 2.2.1-1\n'
  'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.1-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -141,7 +137,6 @@
  'ssh-agent, otherwise it loads them, prompting you for a password if\n'
  'necessary"\n'
  'category: Utils\n'
- 'requires: openssh\n'
  'version: 2.7.1-1\n'
  'install: x86/release/keychain/keychain-2.7.1-1.tar.bz2 32219 '
  '0c7b7ad2636b6e23e40e8cb593196b3fabe9c44f7618ea9b2021b89ecdc08720a7f824be0beaa75c9e62dda9a7b5ed7e9c1ed147a1875c582e80866ad09533a2\n'
@@ -162,7 +157,6 @@
  'automatic discovery of computers, devices, and services on IP networks using\n'
  'industry standard IP protocols."\n'
  'category: Net\n'
- 'requires: libdns_sd1\n'
  'version: 379.32.1-1\n'
  'install: x86/release/mDNSResponder/libdns_sd-devel/libdns_sd-devel-379.32.1-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
@@ -188,7 +182,6 @@
  'automatic discovery of computers, devices, and services on IP networks using\n'
  'industry standard IP protocols."\n'
  'category: Net\n'
- 'requires: libdns_sd1\n'
  'message: mDNSResponder "The Cygwin mDNSResponder package contains only clients.\n'
  "If you do not already have the 'Bonjour Service' installed (it comes with\n"
  'a number of popular Windows programs), then you can download it at\n'
@@ -234,7 +227,6 @@
  'sdesc: "Per-version hint test package"\n'
  'ldesc: "Per-version hint test package"\n'
  'category: Base\n'
- 'requires: base-cygwin cygwin\n'
  'version: 4.8-1\n'
  'install: x86/release/per-version/per-version-4.8-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -260,7 +252,6 @@
  'sdesc: "Replacement per-version hint test package - updated"\n'
  'ldesc: "Replacement per-version hint test package - updated"\n'
  'category: Base\n'
- 'requires: base-cygwin per-version\n'
  'version: 1.0-1\n'
  'install: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1.tar.xz 228 '
  'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
@@ -329,7 +320,6 @@
  '@ test-c\n'
  'sdesc: "test package C"\n'
  'category: Devel Unmaintained\n'
- 'requires: test-d test-e\n'
  'version: 1.0-1\n'
  'install: noarch/release/test-c/test-c-1.0-1.tar.xz 256 '
  'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
@@ -363,7 +353,6 @@
  "It's description might contains some unicode junk\n"
  'Like it’s you’re Markup Language™ Nokogiri’s tool―that Bézier."\n'
  'category: Devel\n'
- 'requires: cygwin\n'
  'version: 1.0-1\n'
  'install: x86/release/testpackage/testpackage-1.0-1.tar.bz2 195 '
  'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'