From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 3410D3858C29; Thu, 18 Jan 2024 19:12:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3410D3858C29 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1705605164; bh=p3fT4Wd8f0S0Co97JZ2E38vEz5QcovpciibTQ5lQ+aw=; h=To:Subject:Date:From:From; b=XcUbnrbWc/gN2iLylOi+NzyD9R6n7t2qNyjqdBKOYUzupeFC32BVMJiL2WF6X8JA7 wCGnGbdtUuJAJ00+IXe9ND73H6oIfTFk5GyAe3oZURrg51/lk7LfNNf0MsX1fNwvZR xB+xBy4qLaA1X1uC7Ee8eU4WadrjPNt1GirvTi+k= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-61-g74e7968 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9506eb50062b2a431c9cf866ef55b09ec0150e97 X-Git-Newrev: 74e796870e2480cde4d14c622cef7369a8e10d2b Message-Id: <20240118191244.3410D3858C29@sourceware.org> Date: Thu, 18 Jan 2024 19:12:43 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=74e796870e2480cde4d14c622cef7369a8e10d2b commit 74e796870e2480cde4d14c622cef7369a8e10d2b Author: Jon Turney Date: Tue Oct 17 13:37:14 2023 +0100 Expunge all python2 modules Diff: --- calm/package.py | 4 ++-- calm/past_mistakes.py | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/calm/package.py b/calm/package.py index f84d494..f70fb98 100755 --- a/calm/package.py +++ b/calm/package.py @@ -1636,10 +1636,10 @@ 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 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.conditional + return Freshness.stale # - explicitly marked as 'noretain' # diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py index 5b7ddb1..c8fbde9 100644 --- a/calm/past_mistakes.py +++ b/calm/past_mistakes.py @@ -171,10 +171,37 @@ nonexistent_provides = historical_provides + [ 'python2', 'python2-devel', 'python27', + 'python-appindicator', + 'python-avahi', + 'python-cairo', + 'python-chardet', + 'python-dbus', + 'python-docutils', + 'python-fontforge', + 'python-gconf', + 'python-gi', + 'python-gnome2', + 'python-gnomevfs2', + 'python-gobject', + 'python-gtk2.0', + 'python-jinja2', + 'python-keybinder', 'python-lxml', + 'python-marisa', 'python-mx', + 'python-numpy', + 'python-orbit', 'python-pygments', + 'python-pykde4', 'python-pynotify', + 'python-pyqt4', + 'python-rdflib', + 'python-reportlab', + 'python-twisted', + 'python-vte', + 'python-wnck', + 'python-xdg', + 'python-zeitgeist', '_windows', r'perl5_\d+', r'ruby_\d+',