From 068585379a583a9c848e44243fab3b2a9074bef2 Mon Sep 17 00:00:00 2001 From: jack1142 <6032823+jack1142@users.noreply.github.com> Date: Sun, 26 Jan 2020 18:16:44 +0100 Subject: [PATCH] docs: deprecation of shared libraries has been postponed to 3.4 (#3449) --- docs/changelog_3_2_0.rst | 2 +- docs/guide_publish_cogs.rst | 2 +- redbot/cogs/downloader/downloader.py | 4 ++-- redbot/core/_sharedlibdeprecation.py | 2 +- redbot/core/core_commands.py | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/changelog_3_2_0.rst b/docs/changelog_3_2_0.rst index 4eabfb12e..ce594cde5 100644 --- a/docs/changelog_3_2_0.rst +++ b/docs/changelog_3_2_0.rst @@ -238,7 +238,7 @@ Removals ~~~~~~~~ - ``[p]set owner`` and ``[p]set token`` have been removed in favor of managing server side. (`#2928 `_) -- Shared libraries are marked for removal in Red 3.3. (`#3106 `_) +- Shared libraries are marked for removal in Red 3.4. (`#3106 `_) - Removed ``[p]backup``. Use the cli command ``redbot-setup backup`` instead. (`#3235 `_) - Removed the functions ``safe_delete``, ``fuzzy_command_search``, ``format_fuzzy_results`` and ``create_backup`` from ``redbot.core.utils``. (`#3240 `_) - Removed a lot of the launcher's handled behavior. (`#3289 `_) diff --git a/docs/guide_publish_cogs.rst b/docs/guide_publish_cogs.rst index c5073c885..64be6b1b7 100644 --- a/docs/guide_publish_cogs.rst +++ b/docs/guide_publish_cogs.rst @@ -81,5 +81,5 @@ Keys specific to the cog info.json (case sensitive) ``SHARED_LIBRARY``. If ``SHARED_LIBRARY`` then ``hidden`` will be ``True``. .. warning:: - Shared libraries are deprecated since version 3.2 and are marked for removal in version 3.3. + Shared libraries are deprecated since version 3.2 and are marked for removal in version 3.4. diff --git a/redbot/cogs/downloader/downloader.py b/redbot/cogs/downloader/downloader.py index 52dc73a1d..ed48f8cfd 100644 --- a/redbot/cogs/downloader/downloader.py +++ b/redbot/cogs/downloader/downloader.py @@ -29,7 +29,7 @@ _ = Translator("Downloader", __file__) DEPRECATION_NOTICE = _( "\n**WARNING:** The following repos are using shared libraries" - " which are marked for removal in Red 3.3: {repo_list}.\n" + " which are marked for removal in Red 3.4: {repo_list}.\n" " You should inform maintainers of these repos about this message." ) @@ -237,7 +237,7 @@ class Downloader(commands.Cog): await self.conf.installed_libraries.set(installed_libraries) async def _shared_lib_load_check(self, cog_name: str) -> Optional[Repo]: - # remove in Red 3.3 + # remove in Red 3.4 is_installed, cog = await self.is_installed(cog_name) # it's not gonna be None when `is_installed` is True # if we'll use typing_extensions in future, `Literal` can solve this diff --git a/redbot/core/_sharedlibdeprecation.py b/redbot/core/_sharedlibdeprecation.py index c4c9d0147..89c0e3136 100644 --- a/redbot/core/_sharedlibdeprecation.py +++ b/redbot/core/_sharedlibdeprecation.py @@ -22,7 +22,7 @@ class SharedLibImportWarner(MetaPathFinder): return None msg = ( "One of cogs uses shared libraries which are" - " deprecated and scheduled for removal in Red 3.3.\n" + " deprecated and scheduled for removal in Red 3.4.\n" "You should inform author of the cog about this message." ) warnings.warn(msg, SharedLibDeprecationWarning, stacklevel=2) diff --git a/redbot/core/core_commands.py b/redbot/core/core_commands.py index 5eb7d6091..f17ab6cce 100644 --- a/redbot/core/core_commands.py +++ b/redbot/core/core_commands.py @@ -126,7 +126,7 @@ class CoreLogic: else: await bot.add_loaded_package(name) loaded_packages.append(name) - # remove in Red 3.3 + # remove in Red 3.4 downloader = bot.get_cog("Downloader") if downloader is None: continue @@ -705,13 +705,13 @@ class Core(commands.Cog, CoreLogic): if len(repos_with_shared_libs) == 1: formed = _( "**WARNING**: The following repo is using shared libs" - " which are marked for removal in Red 3.3: {repo}.\n" + " which are marked for removal in Red 3.4: {repo}.\n" "You should inform maintainer of the repo about this message." ).format(repo=inline(repos_with_shared_libs.pop())) else: formed = _( "**WARNING**: The following repos are using shared libs" - " which are marked for removal in Red 3.3: {repos}.\n" + " which are marked for removal in Red 3.4: {repos}.\n" "You should inform maintainers of these repos about this message." ).format(repos=humanize_list([inline(repo) for repo in repos_with_shared_libs])) output.append(formed) @@ -823,13 +823,13 @@ class Core(commands.Cog, CoreLogic): if len(repos_with_shared_libs) == 1: formed = _( "**WARNING**: The following repo is using shared libs" - " which are marked for removal in Red 3.3: {repo}.\n" + " which are marked for removal in Red 3.4: {repo}.\n" "You should inform maintainers of these repos about this message." ).format(repo=inline(repos_with_shared_libs.pop())) else: formed = _( "**WARNING**: The following repos are using shared libs" - " which are marked for removal in Red 3.3: {repos}.\n" + " which are marked for removal in Red 3.4: {repos}.\n" "You should inform maintainers of these repos about this message." ).format(repos=humanize_list([inline(repo) for repo in repos_with_shared_libs])) output.append(formed)