From 1ff95858073f4df722e524eaedfab5af770a9f5f Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Tue, 5 Mar 2024 10:19:22 +0200 Subject: [PATCH 1/4] chore(datasource): remove unnecessary PyPI changelog URL overrides Removed packages that already have changelog URL in upstream package metadata. Often upstream links are more up to date than these hardcoded ones. E.g. for Django: * Renovate: https://github.com/django/django/tree/master/docs/releases * Upstream: https://docs.djangoproject.com/en/5.0/releases/ --- lib/modules/datasource/metadata-manual.ts | 9 --------- lib/modules/datasource/metadata.spec.ts | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/modules/datasource/metadata-manual.ts b/lib/modules/datasource/metadata-manual.ts index f475f5e8072cbe..fc516261d77f8c 100644 --- a/lib/modules/datasource/metadata-manual.ts +++ b/lib/modules/datasource/metadata-manual.ts @@ -17,17 +17,11 @@ export const manualChangelogUrls: Record> = { 'https://github.com/angular/angular/blob/master/packages/zone.js/CHANGELOG.md', }, pypi: { - alembic: 'https://alembic.sqlalchemy.org/en/latest/changelog.html', beautifulsoup4: 'https://bazaar.launchpad.net/~leonardr/beautifulsoup/bs4/view/head:/CHANGELOG', - django: 'https://github.com/django/django/tree/master/docs/releases', - djangorestframework: - 'https://www.django-rest-framework.org/community/release-notes/', flake8: 'https://flake8.pycqa.org/en/latest/release-notes/index.html', 'django-storages': 'https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst', - hypothesis: - 'https://github.com/HypothesisWorks/hypothesis/blob/master/hypothesis-python/docs/changes.rst', lxml: 'https://git.launchpad.net/lxml/plain/CHANGES.txt', mypy: 'https://mypy-lang.blogspot.com/', phonenumbers: @@ -38,12 +32,9 @@ export const manualChangelogUrls: Record> = { 'https://github.com/flyingcircusio/pycountry/blob/master/HISTORY.txt', 'django-debug-toolbar': 'https://django-debug-toolbar.readthedocs.io/en/latest/changes.html', - 'firebase-admin': - 'https://firebase.google.com/support/release-notes/admin/python', requests: 'https://github.com/psf/requests/blob/master/HISTORY.md', sqlalchemy: 'https://docs.sqlalchemy.org/en/latest/changelog/', uwsgi: 'https://uwsgi-docs.readthedocs.io/en/latest/#release-notes', - wagtail: 'https://github.com/wagtail/wagtail/tree/master/docs/releases', }, docker: { 'gitlab/gitlab-ce': diff --git a/lib/modules/datasource/metadata.spec.ts b/lib/modules/datasource/metadata.spec.ts index da55b5bd5f1ddd..438e3447e692e5 100644 --- a/lib/modules/datasource/metadata.spec.ts +++ b/lib/modules/datasource/metadata.spec.ts @@ -25,12 +25,12 @@ describe('modules/datasource/metadata', () => { }; const datasource = PypiDatasource.id; - const packageName = 'django'; + const packageName = 'uwsgi'; addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ changelogUrl: - 'https://github.com/django/django/tree/master/docs/releases', + 'https://uwsgi-docs.readthedocs.io/en/latest/#release-notes', }); }); From c2c5eba8c857dd4a739c6aec5c76550af38e8814 Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Tue, 5 Mar 2024 10:33:55 +0200 Subject: [PATCH 2/4] Update snapshot --- lib/modules/datasource/__snapshots__/metadata.spec.ts.snap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/modules/datasource/__snapshots__/metadata.spec.ts.snap b/lib/modules/datasource/__snapshots__/metadata.spec.ts.snap index 74602e1015d630..8151369542033f 100644 --- a/lib/modules/datasource/__snapshots__/metadata.spec.ts.snap +++ b/lib/modules/datasource/__snapshots__/metadata.spec.ts.snap @@ -34,7 +34,7 @@ exports[`modules/datasource/metadata Should handle failed parsing of sourceUrls exports[`modules/datasource/metadata Should handle manualChangelogUrls 1`] = ` { - "changelogUrl": "https://github.com/django/django/tree/master/docs/releases", + "changelogUrl": "https://uwsgi-docs.readthedocs.io/en/latest/#release-notes", "releases": [ { "releaseTimestamp": "2018-07-13T10:14:17.000Z", @@ -53,7 +53,6 @@ exports[`modules/datasource/metadata Should handle manualChangelogUrls 1`] = ` "version": "2.2.0", }, ], - "sourceUrl": "https://github.com/django/django", } `; From 9db566c7a4f21a91df0ed6bfd4e4f0ac3dc46275 Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Tue, 12 Mar 2024 12:25:36 +0200 Subject: [PATCH 3/4] Fix test after merge --- lib/modules/datasource/metadata.spec.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/modules/datasource/metadata.spec.ts b/lib/modules/datasource/metadata.spec.ts index 8545420857ccaf..fcc53a608656a7 100644 --- a/lib/modules/datasource/metadata.spec.ts +++ b/lib/modules/datasource/metadata.spec.ts @@ -512,13 +512,12 @@ describe('modules/datasource/metadata', () => { const dep = partial({}); const datasource = PypiDatasource.id; - const packageName = 'django'; + const packageName = 'uwsgi'; addMetaData(dep, datasource, packageName); expect(dep).toEqual({ changelogUrl: - 'https://github.com/django/django/tree/master/docs/releases', - sourceUrl: 'https://github.com/django/django', + 'https://uwsgi-docs.readthedocs.io/en/latest/#release-notes', }); }); From c988ef6c52c3e22f0749a3f3e115c211c7e79399 Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Tue, 12 Mar 2024 13:02:45 +0200 Subject: [PATCH 4/4] Use different package in tests --- .../datasource/__snapshots__/metadata.spec.ts.snap | 3 ++- lib/modules/datasource/metadata.spec.ts | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/modules/datasource/__snapshots__/metadata.spec.ts.snap b/lib/modules/datasource/__snapshots__/metadata.spec.ts.snap index 8151369542033f..3954823e05f0fb 100644 --- a/lib/modules/datasource/__snapshots__/metadata.spec.ts.snap +++ b/lib/modules/datasource/__snapshots__/metadata.spec.ts.snap @@ -34,7 +34,7 @@ exports[`modules/datasource/metadata Should handle failed parsing of sourceUrls exports[`modules/datasource/metadata Should handle manualChangelogUrls 1`] = ` { - "changelogUrl": "https://uwsgi-docs.readthedocs.io/en/latest/#release-notes", + "changelogUrl": "https://github.com/flyingcircusio/pycountry/blob/master/HISTORY.txt", "releases": [ { "releaseTimestamp": "2018-07-13T10:14:17.000Z", @@ -53,6 +53,7 @@ exports[`modules/datasource/metadata Should handle manualChangelogUrls 1`] = ` "version": "2.2.0", }, ], + "sourceUrl": "https://github.com/flyingcircusio/pycountry", } `; diff --git a/lib/modules/datasource/metadata.spec.ts b/lib/modules/datasource/metadata.spec.ts index fcc53a608656a7..0b49c803ce8db8 100644 --- a/lib/modules/datasource/metadata.spec.ts +++ b/lib/modules/datasource/metadata.spec.ts @@ -27,12 +27,12 @@ describe('modules/datasource/metadata', () => { }; const datasource = PypiDatasource.id; - const packageName = 'uwsgi'; + const packageName = 'pycountry'; addMetaData(dep, datasource, packageName); expect(dep).toMatchSnapshot({ changelogUrl: - 'https://uwsgi-docs.readthedocs.io/en/latest/#release-notes', + 'https://github.com/flyingcircusio/pycountry/blob/master/HISTORY.txt', }); }); @@ -512,12 +512,13 @@ describe('modules/datasource/metadata', () => { const dep = partial({}); const datasource = PypiDatasource.id; - const packageName = 'uwsgi'; + const packageName = 'pycountry'; addMetaData(dep, datasource, packageName); expect(dep).toEqual({ changelogUrl: - 'https://uwsgi-docs.readthedocs.io/en/latest/#release-notes', + 'https://github.com/flyingcircusio/pycountry/blob/master/HISTORY.txt', + sourceUrl: 'https://github.com/flyingcircusio/pycountry', }); });