Expire python34 left-overs

cygwin · Mar 31, 2024 · 886e9b7 · 886e9b7
1 parent 27a2ad8
commit 886e9b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/calm/package.py b/calm/package.py
@@ -1636,10 +1636,9 @@ def mark_fn(packages, po, v, certain_age, vault_requests):
     # - if package depends on anything in expired_provides
     #
     requires = po.version_hints[v].get('depends', '').split(', ')
-    if re.match(r'^python(|2|27)[-_]', pn):
-        if any(ep in requires for ep in past_mistakes.expired_provides) or po.obsolete:
-            logging.debug("package '%s' version '%s' not retained as it requires a provide known to be expired" % (pn, v))
-            return Freshness.stale
+    if any(ep in requires for ep in past_mistakes.expired_provides):
+        logging.debug("package '%s' version '%s' not retained as it requires a provide known to be expired" % (pn, v))
+        return Freshness.conditional
 
     # - explicitly marked as 'noretain'
     #

diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
@@ -256,8 +256,7 @@
 
 # provides: which don't exist and packages which require them should be expired
 expired_provides = [
-    'python2',
-    'python27',
+    'python34',
 ]
 
 # empty source packages