From b8cbaa2fa04f7451d8a44d2308182451845f97f4 Mon Sep 17 00:00:00 2001 From: Michael H Date: Tue, 5 Nov 2019 08:13:32 -0500 Subject: [PATCH] Merge 3.1.7 (#3098) * uvloop + python3.8 * Lavalink bump to 3.2.1_846 * [Release] 3.1.7 - Handles a dependency issue for python3.8 - Updates the Lavalink jar used - This include's Nin's stat fix - Streaming from Soundcloud is working again, at least for now. * 3.1.7 --- redbot/__init__.py | 2 +- redbot/cogs/audio/manager.py | 2 +- setup.cfg | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/redbot/__init__.py b/redbot/__init__.py index fffb3af7c..2f62106d6 100644 --- a/redbot/__init__.py +++ b/redbot/__init__.py @@ -173,7 +173,7 @@ class VersionInfo: ) -__version__ = "3.1.6" +__version__ = "3.1.7" version_info = VersionInfo.from_str(__version__) # Filter fuzzywuzzy slow sequence matcher warning diff --git a/redbot/cogs/audio/manager.py b/redbot/cogs/audio/manager.py index 06c61d428..14175275d 100644 --- a/redbot/cogs/audio/manager.py +++ b/redbot/cogs/audio/manager.py @@ -18,7 +18,7 @@ from redbot.core import data_manager from .errors import LavalinkDownloadFailed JAR_VERSION = "3.2.1" -JAR_BUILD = 823 +JAR_BUILD = 846 LAVALINK_DOWNLOAD_URL = ( f"https://github.com/Cog-Creators/Lavalink-Jars/releases/download/{JAR_VERSION}_{JAR_BUILD}/" f"Lavalink.jar" diff --git a/setup.cfg b/setup.cfg index ae033b1e1..929144bab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,7 +49,9 @@ install_requires = Red-Lavalink==0.4.0 schema==0.7.0 tqdm==4.35.0 - uvloop==0.13.0; sys_platform != "win32" and platform_python_implementation == "CPython" + # Below is due to an issue with uvloop < 0.14 with python 3.8, move both to 0.14 at full release + uvloop==0.13.0; sys_platform != "win32" and platform_python_implementation == "CPython" and python_version<"3.8" + uvloop==0.14.0rc2; sys_platform != "win32" and platform_python_implementation == "CPython" and python_version>="3.8" websockets==6.0 yarl==1.3.0