From 8fc9d4c96b09228e381657e6f3bd4f678e44c595 Mon Sep 17 00:00:00 2001 From: J-Rios Date: Mon, 12 Oct 2020 15:26:55 +0200 Subject: [PATCH] Remove multicolorcaptcha submodule. Use it from pypi package. --- .gitmodules | 3 --- README.md | 2 +- requirements.txt | 1 + sources/join_captcha_bot.py | 2 +- sources/lib/multicolor_captcha_generator | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) delete mode 160000 sources/lib/multicolor_captcha_generator diff --git a/.gitmodules b/.gitmodules index b2f7fbf..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "sources/lib/multicolor_captcha_generator"] - path = sources/lib/multicolor_captcha_generator - url = https://github.com/J-Rios/multicolor_captcha_generator diff --git a/README.md b/README.md index 33ca03d..dbc598c 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ To generate Captchas, the Bot uses [multicolor_captcha_generator library](https: 2. Get the project and install JoinCaptchaBot requirements: ```bash - git clone --recurse-submodules https://github.com/J-Rios/TLG_JoinCaptchaBot + git clone https://github.com/J-Rios/TLG_JoinCaptchaBot pip install -r TLG_JoinCaptchaBot/requirements.txt ``` diff --git a/requirements.txt b/requirements.txt index 5db0ffa..3f4ad53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ python_telegram_bot==12.8.0 Pillow==7.1.2 +multicolorcaptcha==1.0.0 diff --git a/sources/join_captcha_bot.py b/sources/join_captcha_bot.py index f131912..29394db 100644 --- a/sources/join_captcha_bot.py +++ b/sources/join_captcha_bot.py @@ -40,7 +40,7 @@ from telegram.ext import (CallbackContext, Updater, CommandHandler, MessageHandl from constants import SCRIPT_PATH, CONST, TEXT from tsjson import TSjson -from lib.multicolor_captcha_generator.img_captcha_gen import CaptchaGenerator +from multicolorcaptcha import CaptchaGenerator ################################################################################ ### Globals diff --git a/sources/lib/multicolor_captcha_generator b/sources/lib/multicolor_captcha_generator deleted file mode 160000 index 955c11c..0000000 --- a/sources/lib/multicolor_captcha_generator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 955c11cb55098c5983b6d2fe0b213ca16556b7bb