From a6237bb9dfd7e9c28421f0b37d92796454b9c122 Mon Sep 17 00:00:00 2001 From: MarkKoz Date: Wed, 4 Mar 2020 18:16:04 -0800 Subject: Add more pre-commit hooks Hooks added: * check-merge-conflict - checks for files with merge conflict strings * check-toml - attempts to load all toml files to verify syntax * check-yaml - attempts to load all yaml files to verify syntax * end-of-file-fixer - ensures files end in a newline and only a newline * mixed-line-ending - replaces mixed line endings with LF * trailing-whitespace - trims trailing whitespace * python-check-blanket-noqa - enforces that noqa annotations always occur with specific codes Changes made to comply with new hooks: * Remove trailing whitespaces * Convert some CRLF files to LF * Remove noqa and add missing type annotations * Add missing newlines at end of files See: python-discord/organisation#138 --- bot/resources/evergreen/game_recs/chrono_trigger.json | 2 +- bot/resources/evergreen/game_recs/digimon_world.json | 2 +- bot/resources/evergreen/game_recs/doom_2.json | 2 +- bot/resources/evergreen/game_recs/skyrim.json | 2 +- bot/resources/evergreen/magic8ball.json | 2 +- bot/resources/evergreen/trivia_quiz.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'bot/resources/evergreen') diff --git a/bot/resources/evergreen/game_recs/chrono_trigger.json b/bot/resources/evergreen/game_recs/chrono_trigger.json index 219c1e78..9720b977 100644 --- a/bot/resources/evergreen/game_recs/chrono_trigger.json +++ b/bot/resources/evergreen/game_recs/chrono_trigger.json @@ -4,4 +4,4 @@ "link": "https://rawg.io/games/chrono-trigger-1995", "image": "https://vignette.wikia.nocookie.net/chrono/images/2/24/Chrono_Trigger_cover.jpg", "author": "352635617709916161" -} \ No newline at end of file +} diff --git a/bot/resources/evergreen/game_recs/digimon_world.json b/bot/resources/evergreen/game_recs/digimon_world.json index a2820f8e..c1cb4f37 100644 --- a/bot/resources/evergreen/game_recs/digimon_world.json +++ b/bot/resources/evergreen/game_recs/digimon_world.json @@ -4,4 +4,4 @@ "image": "https://www.mobygames.com/images/covers/l/437308-digimon-world-playstation-front-cover.jpg", "link": "https://rawg.io/games/digimon-world", "author": "352635617709916161" -} \ No newline at end of file +} diff --git a/bot/resources/evergreen/game_recs/doom_2.json b/bot/resources/evergreen/game_recs/doom_2.json index e228e2b1..b60cc05f 100644 --- a/bot/resources/evergreen/game_recs/doom_2.json +++ b/bot/resources/evergreen/game_recs/doom_2.json @@ -4,4 +4,4 @@ "image": "https://upload.wikimedia.org/wikipedia/en/thumb/2/29/Doom_II_-_Hell_on_Earth_Coverart.png/220px-Doom_II_-_Hell_on_Earth_Coverart.png", "link": "https://rawg.io/games/doom-ii", "author": "352635617709916161" -} \ No newline at end of file +} diff --git a/bot/resources/evergreen/game_recs/skyrim.json b/bot/resources/evergreen/game_recs/skyrim.json index 09f93563..ad86db31 100644 --- a/bot/resources/evergreen/game_recs/skyrim.json +++ b/bot/resources/evergreen/game_recs/skyrim.json @@ -4,4 +4,4 @@ "image": "https://upload.wikimedia.org/wikipedia/en/1/15/The_Elder_Scrolls_V_Skyrim_cover.png", "link": "https://rawg.io/games/the-elder-scrolls-v-skyrim", "author": "352635617709916161" -} \ No newline at end of file +} diff --git a/bot/resources/evergreen/magic8ball.json b/bot/resources/evergreen/magic8ball.json index 6fe86950..f5f1df62 100644 --- a/bot/resources/evergreen/magic8ball.json +++ b/bot/resources/evergreen/magic8ball.json @@ -19,4 +19,4 @@ "My sources say no", "Outlook not so good", "Very doubtful" -] \ No newline at end of file +] diff --git a/bot/resources/evergreen/trivia_quiz.json b/bot/resources/evergreen/trivia_quiz.json index 48ee2ce4..6100ca62 100644 --- a/bot/resources/evergreen/trivia_quiz.json +++ b/bot/resources/evergreen/trivia_quiz.json @@ -29,7 +29,7 @@ "hints": ["The game was released in 1990.", "It was released on the SNES."], "question": "What was the first game Yoshi appeared in?", "answer": "Super Mario World" - } + } ], "general":[ { -- cgit v1.2.3