Skip to content

Commit

Permalink
Expunge all python2 modules
Browse files Browse the repository at this point in the history
  • Loading branch information
jon-turney committed Jan 9, 2024
1 parent 9506eb5 commit 74e7968
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
4 changes: 2 additions & 2 deletions calm/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
#
Expand Down
27 changes: 27 additions & 0 deletions calm/past_mistakes.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,37 @@
'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+',
Expand Down

0 comments on commit 74e7968

Please sign in to comment.