public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-61-g74e7968
@ 2024-01-18 19:12 Jon Turney
0 siblings, 0 replies; only message in thread
From: Jon Turney @ 2024-01-18 19:12 UTC (permalink / raw)
To: cygwin-apps-cvs
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=74e796870e2480cde4d14c622cef7369a8e10d2b
commit 74e796870e2480cde4d14c622cef7369a8e10d2b
Author: Jon Turney <jon.turney@dronecode.org.uk>
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+',
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-18 19:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-18 19:12 [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-61-g74e7968 Jon Turney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).