diff options
| author |  Chris Lovering <[email protected]> | 2024-10-03 23:18:18 +0100 |
|---|---|---|
| committer | Chris Lovering <[email protected]> | 2024-10-06 11:52:44 +0100 |
| commit | 60e29b1a15a2f026a71114fed7bb2f2f93b2548d (patch) | |
| tree | bf0dfb384c966d3420b06cae78a272ca60c746e0 | |
| parent | Raise error if invalid metabase credentials are used (diff) | |
Support both Python 3.12 and 3.13 in eval
| -rw-r--r-- | bot/exts/utils/snekbox/_cog.py | 12 | ||||
| -rw-r--r-- | bot/exts/utils/snekbox/_eval.py | 1 | ||||
| -rw-r--r-- | tests/bot/exts/utils/snekbox/test_snekbox.py | 9 |
3 files changed, 11 insertions, 11 deletions
diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py index decc1780b..32384c43f 100644 --- a/bot/exts/utils/snekbox/_cog.py +++ b/bot/exts/utils/snekbox/_cog.py @@ -86,7 +86,7 @@ SNEKBOX_ROLES = (Roles.helpers, Roles.moderators, Roles.admins, Roles.owners, Ro REDO_EMOJI = "\U0001f501" # :repeat: REDO_TIMEOUT = 30 -SupportedPythonVersions = Literal["3.12"] +SupportedPythonVersions = Literal["3.12", "3.13"] class FilteredFiles(NamedTuple): @@ -181,18 +181,16 @@ class Snekbox(Cog): ) -> interactions.ViewWithUserAndRoleCheck: """Return a view that allows the user to change what version of Python their code is run on.""" alt_python_version: SupportedPythonVersions - if current_python_version == "3.10": - alt_python_version = "3.11" + if current_python_version == "3.12": + alt_python_version = "3.13" else: - alt_python_version = "3.10" # noqa: F841 + alt_python_version = "3.12" view = interactions.ViewWithUserAndRoleCheck( allowed_users=(ctx.author.id,), allowed_roles=MODERATION_ROLES, ) - # Temp disabled until snekbox multi-version support is complete - # https://github.com/python-discord/snekbox/issues/158 - # view.add_item(PythonVersionSwitcherButton(alt_python_version, self, ctx, job)) + view.add_item(PythonVersionSwitcherButton(alt_python_version, self, ctx, job)) view.add_item(interactions.DeleteMessageButton()) return view diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py index 3867b81de..94f33b122 100644 --- a/bot/exts/utils/snekbox/_eval.py +++ b/bot/exts/utils/snekbox/_eval.py @@ -50,6 +50,7 @@ class EvalJob: return { "args": self.args, "files": [file.to_dict() for file in self.files], + "executable_path": f"/snekbin/python/{self.version}/bin/python", } diff --git a/tests/bot/exts/utils/snekbox/test_snekbox.py b/tests/bot/exts/utils/snekbox/test_snekbox.py index 3595d9a67..6a2ab5c24 100644 --- a/tests/bot/exts/utils/snekbox/test_snekbox.py +++ b/tests/bot/exts/utils/snekbox/test_snekbox.py @@ -35,8 +35,8 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase): context_manager = MagicMock() context_manager.__aenter__.return_value = resp self.bot.http_session.post.return_value = context_manager - - job = EvalJob.from_code("import random").as_version("3.10") + py_version = "3.12" + job = EvalJob.from_code("import random").as_version(py_version) self.assertEqual(await self.cog.post_job(job), EvalResult("Hi", 137)) expected = { @@ -44,9 +44,10 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase): "files": [ { "path": "main.py", - "content": b64encode(b"import random").decode() + "content": b64encode(b"import random").decode(), } - ] + ], + "executable_path": f"/snekbin/python/{py_version}/bin/python", } self.bot.http_session.post.assert_called_with( constants.URLs.snekbox_eval_api, |