gnouseu/tuxbot-bot
4
0
Fork 0
Code Issues Pull requests Wiki Activity

fix(deps): fix conflict version

Browse source
This commit is contained in:
Romain J 2021-02-11 17:51:46 +01:00
parent fae56745bf
commit c566f775cd
5 changed files with 21 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
setup.cfg
View file

@ -15,22 +15,20 @@ platforms = linux
packages = find_namespace:
python_requires = >=3.8
install_requires =
appdirs>=1.4.4
asyncpg>=0.21.0
Babel>=2.8.0
appdirs==1.4.4
asyncpg==0.21.0
Babel==2.8.0
discord.py @ git+https://github.com/Rapptz/discord.py
discord_flags>=2.1.1
humanize>=2.6.0
ipinfo>=4.1.0
ipwhois>=1.2.0
humanize==2.6.0
ipinfo==4.1.0
ipwhois==1.2.0
jishaku @ git+https://github.com/Gorialis/jishaku
psutil>=5.7.2
pydig>=0.3.0
requests>=2.25.1
rich>=6.0.0
sentry_sdk>=0.19.5
structured_config>=4.12
tortoise-orm>=0.16.17
psutil==5.7.2
pydig==0.3.0
rich==9.10.0
sentry_sdk==0.19.5
structured_config==4.12
tortoise-orm==0.16.17
[options.entry_points]
console_scripts =

6
tuxbot/cogs/Admin/locales/en-US.po~
View file

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tuxbot-bot\n"
"Report-Msgid-Bugs-To: rick@gnous.eu\n"
"POT-Creation-Date: 2020-10-21 01:13+0200\n"
"POT-Creation-Date: 2020-11-11 02:40+0100\n"
"PO-Revision-Date: 2020-06-10 00:38+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -17,11 +17,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: tuxbot/cogs/admin/admin.py:47
#: tuxbot/cogs/Admin/admin.py:50
#, python-brace-format
msgid "Locale changed to {lang} successfully"
msgstr ""
#: tuxbot/cogs/admin/admin.py:62
#: tuxbot/cogs/Admin/admin.py:65
msgid "List of available locales: "
msgstr ""

6
tuxbot/cogs/Admin/locales/fr-FR.po~
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tuxbot-bot\n"
"Report-Msgid-Bugs-To: rick@gnous.eu\n"
"POT-Creation-Date: 2020-10-21 01:13+0200\n"
"POT-Creation-Date: 2020-11-11 02:40+0100\n"
"PO-Revision-Date: 2020-06-10 00:38+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -18,11 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: tuxbot/cogs/admin/admin.py:47
#: tuxbot/cogs/Admin/admin.py:50
#, fuzzy, python-brace-format
msgid "Locale changed to {lang} successfully"
msgstr "Langue changée pour {lang} avec succès"
#: tuxbot/cogs/admin/admin.py:62
#: tuxbot/cogs/Admin/admin.py:65
msgid "List of available locales: "
msgstr "Liste des langues disponibles : "

100
tuxbot/cogs/Utils/locales/en-US.po~
View file

@ -1,100 +0,0 @@
# English translations for Tuxbot-bot package.
# Copyright (C) 2020 THE Tuxbot-bot'S COPYRIGHT HOLDER
# This file is distributed under the same license as the Tuxbot-bot package.
# Automatically generated, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: Tuxbot-bot\n"
"Report-Msgid-Bugs-To: rick@gnous.eu\n"
"POT-Creation-Date: 2020-11-11 02:40+0100\n"
"PO-Revision-Date: 2020-06-10 00:38+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en_US\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: tuxbot/cogs/Utils/utils.py:38
msgid "Information about TuxBot"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:44
msgid "__:busts_in_silhouette: Development__"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:61
msgid ""
"**{}** physical memory\n"
"**{}** virtual memory"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:72
msgid "__Servers count__"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:77
msgid "__Channels count__"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:82
msgid "__Members count__"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:88
msgid "__:file_folder: Files__"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:95
msgid "__¶ Lines__"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:105
msgid "__Latest changes__"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:111
msgid "__:link: Links__"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:116
msgid "| [Invite]"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:131
msgid "Contributors"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:187
msgid "Invite"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:191
msgid "Minimal"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:193
msgid ""
"The minimum permissions include the strict requirements for the proper "
"functioning of all basics commands.\n"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:203
msgid "Admin"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:205
msgid ""
"All minimal permissions + extra permissions for admin commands such as kick "
"and ban\n"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:233
msgid "Unable to find `{}`"
msgstr ""
#: tuxbot/cogs/Utils/utils.py:241
msgid "Unable to fetch lines for `{}`"
msgstr ""

7
tuxbot/setup.py
View file

@ -4,10 +4,11 @@ import logging
import os
import re
import sys
import json
from argparse import Namespace
from pathlib import Path
from typing import Union, List
import requests
from urllib import request
from rich.prompt import Prompt, IntPrompt
from rich.console import Console
@ -432,9 +433,7 @@ def basic_setup() -> None:
def update() -> None:
response = requests.get(
"https://api.github.com/repos/Rom1-J/tuxbot-bot/commits/master"
).json()
response = json.load(request.urlopen("https://api.github.com/repos/Rom1-J/tuxbot-bot/commits/master"))
if response.get("sha")[:6] == version_info.build:
print(