From 76749f8f76f4d93c6e3fed0b51a41eced4830987 Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Mon, 24 Apr 2023 11:20:07 +0100 Subject: [PATCH 1/3] Remove redundant URL part --- setuptools/config/setupcfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setuptools/config/setupcfg.py b/setuptools/config/setupcfg.py index 050e538560..bb35559069 100644 --- a/setuptools/config/setupcfg.py +++ b/setuptools/config/setupcfg.py @@ -786,4 +786,4 @@ def message(cls, **kw): class _DeprecatedConfig(SetuptoolsDeprecationWarning): - _SEE_DOCS = "https://setuptools.pypa.io/en/latest/userguide/declarative_config.html" + _SEE_DOCS = "userguide/declarative_config.html" From 8b4830d21dad97fc1bb69342e8dc6952b56df092 Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Mon, 24 Apr 2023 11:28:48 +0100 Subject: [PATCH 2/3] Avoid bitly links --- setuptools/command/easy_install.py | 2 +- setuptools/package_index.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 29e424a806..8497bbdb39 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1845,7 +1845,7 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None): # get/del patterns instead. For more detailed information see the # following links: # https://github.com/pypa/setuptools/issues/202#issuecomment-202913420 - # http://bit.ly/2h9itJX + # https://foss.heptapod.net/pypy/pypy/-/blob/144c4e65cb6accb8e592f3a7584ea38265d1873c/pypy/module/zipimport/interp_zipimport.py old_entry = cache[p] del cache[p] new_entry = updater and updater(p, old_entry) diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 06b78ac6ee..b992048c0d 100644 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -402,7 +402,8 @@ def url_ok(self, url, fatal=False): return True msg = ( "\nNote: Bypassing %s (disallowed host; see " - "http://bit.ly/2hrImnY for details).\n" + "https://setuptools.pypa.io/en/latest/deprecated/" + "easy_install.html#restricting-downloads-with-allow-hosts for details).\n" ) if fatal: raise DistutilsError(msg % url) From 9a48d651828dd5104cc563502e62fb5bb0e0ba02 Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Mon, 24 Apr 2023 11:32:37 +0100 Subject: [PATCH 3/3] Add news fragment --- changelog.d/3902.misc.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/3902.misc.rst diff --git a/changelog.d/3902.misc.rst b/changelog.d/3902.misc.rst new file mode 100644 index 0000000000..0b05d6a10d --- /dev/null +++ b/changelog.d/3902.misc.rst @@ -0,0 +1 @@ +Fixed wrong URLs used in warnings and logs.