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/valentines/date_ideas.json | 2 -- bot/resources/valentines/love_matches.json | 2 +- bot/resources/valentines/pickup_lines.json | 2 +- bot/resources/valentines/valenstates.json | 2 +- bot/resources/valentines/valentine_facts.json | 2 +- bot/resources/valentines/zodiac_compatibility.json | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) (limited to 'bot/resources/valentines') diff --git a/bot/resources/valentines/date_ideas.json b/bot/resources/valentines/date_ideas.json index 09d31067..995f14bb 100644 --- a/bot/resources/valentines/date_ideas.json +++ b/bot/resources/valentines/date_ideas.json @@ -123,5 +123,3 @@ } ] } - - diff --git a/bot/resources/valentines/love_matches.json b/bot/resources/valentines/love_matches.json index 8d50cd79..7df2dbda 100644 --- a/bot/resources/valentines/love_matches.json +++ b/bot/resources/valentines/love_matches.json @@ -55,4 +55,4 @@ ], "text": "You two will most likely have the perfect relationship. But don't think that this means you don't have to do anything for it to work. Talking to each other and spending time together is key, even in a seemingly perfect relationship." } -} \ No newline at end of file +} diff --git a/bot/resources/valentines/pickup_lines.json b/bot/resources/valentines/pickup_lines.json index a18d0840..eb01290f 100644 --- a/bot/resources/valentines/pickup_lines.json +++ b/bot/resources/valentines/pickup_lines.json @@ -94,4 +94,4 @@ "image": "https://upload.wikimedia.org/wikipedia/en/thumb/0/0c/The_Genie_Aladdin.png/220px-The_Genie_Aladdin.png" } ] -} \ No newline at end of file +} diff --git a/bot/resources/valentines/valenstates.json b/bot/resources/valentines/valenstates.json index 06cbb2e5..c58a5b7c 100644 --- a/bot/resources/valentines/valenstates.json +++ b/bot/resources/valentines/valenstates.json @@ -119,4 +119,4 @@ "text": "", "flag": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a9/Flag_of_Wales_%281959%E2%80%93present%29.svg/1920px-Flag_of_Wales_%281959%E2%80%93present%29.svg.png" } -} \ No newline at end of file +} diff --git a/bot/resources/valentines/valentine_facts.json b/bot/resources/valentines/valentine_facts.json index d2ffa980..e6f826c3 100644 --- a/bot/resources/valentines/valentine_facts.json +++ b/bot/resources/valentines/valentine_facts.json @@ -21,4 +21,4 @@ "There's a form of cryptological communication called 'Floriography', in which you communicate through flowers. Meaning has been attributed to flowers for thousands of years, and some form of floriography has been practiced in traditional cultures throughout Europe, Asia, and Africa. Here are some meanings for roses you might want to take a look at, if you plan on gifting your loved one a bouquet of roses on Valentine's Day:\n\u200b\nRed: eternal love\nPink: young, developing love\nWhite: innocence, fervor, loyalty\nOrange: happiness, security\nViolet: love at first sight\nBlue: unfulfilled longing, quiet desire\nYellow: friendship, jealousy, envy, infidelity\nBlack: unfulfilled longing, quiet desire, grief, hatred, misfortune, death", "Traditionally, young girls in the U.S. and the U.K. believed they could tell what type of man they would marry depending on the type of bird they saw first on Valentine's Day. If they saw a blackbird, they would marry a clergyman, a robin redbreast indicated a sailor, and a goldfinch indicated a rich man. A sparrow meant they would marry a farmer, a bluebird indicated a happy man, and a crossbill meant an argumentative man. If they saw a dove, they would marry a good man, but seeing a woodpecker meant they would not marry at all." ] -} \ No newline at end of file +} diff --git a/bot/resources/valentines/zodiac_compatibility.json b/bot/resources/valentines/zodiac_compatibility.json index 4e337714..3971d40d 100644 --- a/bot/resources/valentines/zodiac_compatibility.json +++ b/bot/resources/valentines/zodiac_compatibility.json @@ -259,4 +259,4 @@ } ] -} \ No newline at end of file +} -- cgit v1.2.3