Skip to content

Commit

Permalink
tengine -> tengi, pypi
Browse files Browse the repository at this point in the history
  • Loading branch information
lavadk committed May 17, 2021
1 parent c444c55 commit beb1c7f
Show file tree
Hide file tree
Showing 23 changed files with 32 additions and 34 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "tengine"]
path = tengine
url = https://github.com/luckybots/tengine.git
[submodule "helpy_files"]
path = helpy_files
url = https://github.com/luckybots/helpy_files
4 changes: 2 additions & 2 deletions liker/command/handler_set_reactions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import inject
import logging
from tengine.command.command_handler import *
from tengine import telegram_bot_utils
from tengi.command.command_handler import *
from tengi import telegram_bot_utils

from liker.state.enabled_channels import EnabledChannels
from liker.enabling_manager import EnablingManager
Expand Down
4 changes: 2 additions & 2 deletions liker/command/handler_take_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import logging
import time
from telebot.apihelper import ApiTelegramException
from tengine.command.command_handler import *
from tengine import TelegramBot, TelegramApi, telegram_api_utils, telegram_error
from tengi.command.command_handler import *
from tengi import TelegramBot, TelegramApi, telegram_api_utils, telegram_error

from liker.setup import constants
from liker.custom_markup import markup_utils
Expand Down
4 changes: 2 additions & 2 deletions liker/command/handler_update_markup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import inject
import logging
from tengine.command.command_handler import *
from tengi.command.command_handler import *
from telebot.types import InlineKeyboardMarkup, Message
from typing import Tuple
from tengine import CommandMissingArgError
from tengi import CommandMissingArgError

from liker.state.enabled_channels import EnabledChannels
from liker.state.space_state import SpaceState
Expand Down
4 changes: 2 additions & 2 deletions liker/command/params.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from tengine import CommandParam, tengine_command_params
from tengi import CommandParam, tengi_command_params

command_params = tengine_command_params.params + [
command_params = tengi_command_params.params + [
CommandParam(name='--channel_id',
help_str='Channel id',
param_type=str),
Expand Down
4 changes: 2 additions & 2 deletions liker/custom_markup/channel_post_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import inject
from telebot.apihelper import ApiTelegramException
from telebot.types import InlineKeyboardMarkup
from tengine import Config, TelegramBot, telegram_bot_utils, Hasher, AbuseDetector, ReplyContextSuppress
from tengine.telegram.inbox_handler import *
from tengi import Config, TelegramBot, telegram_bot_utils, Hasher, AbuseDetector, ReplyContextSuppress
from tengi.telegram.inbox_handler import *

from liker.state.space_state import SpaceState
from liker.state.enabled_channels import EnabledChannels
Expand Down
6 changes: 3 additions & 3 deletions liker/custom_markup/comment_handler.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import logging
import inject
from telebot.types import InlineKeyboardMarkup
from tengine import telegram_bot_utils
from tengine.telegram.inbox_handler import *
from tengine.telegram.constants import TELEGRAM_USER_ID
from tengi import telegram_bot_utils
from tengi.telegram.inbox_handler import *
from tengi.telegram.constants import TELEGRAM_USER_ID

from liker.state.enabled_channels import EnabledChannels
from liker.state.space_state import SpaceState
Expand Down
2 changes: 1 addition & 1 deletion liker/custom_markup/markup_synchronizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from telebot.apihelper import ApiTelegramException
from typing import Optional
from telebot.types import InlineKeyboardMarkup
from tengine import Config, TelegramBot, telegram_error
from tengi import Config, TelegramBot, telegram_error

from liker.state.enabled_channels import EnabledChannels
from liker.state.space_state import SpaceState
Expand Down
2 changes: 1 addition & 1 deletion liker/custom_markup/markup_utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
from telebot import types
from typing import Iterable, List, Optional
from tengine import telegram_bot_utils
from tengi import telegram_bot_utils

from liker.setup import constants

Expand Down
2 changes: 1 addition & 1 deletion liker/enabling_manager.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
import inject
from telebot.apihelper import ApiTelegramException
from tengine import Config, telegram_bot_utils, TelegramBot, ReplyContext
from tengi import Config, telegram_bot_utils, TelegramBot, ReplyContext

from liker.state.enabled_channels import EnabledChannels

Expand Down
2 changes: 1 addition & 1 deletion liker/run.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# noinspection PyUnresolvedReferences
from liker.setup import logs # has import side effect
import inject
from tengine import App
from tengi import App

from liker.setup.dependencies import bind_app_dependencies
from liker.setup.daemons import create_daemon_instances
Expand Down
2 changes: 1 addition & 1 deletion liker/setup/daemons.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import inject
from tengine import MessagesLogger, AbuseJanitor, TelegramApi
from tengi import MessagesLogger, AbuseJanitor, TelegramApi


def create_daemon_instances():
Expand Down
2 changes: 1 addition & 1 deletion liker/setup/dependencies.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from inject import Binder
import inject
from tengine import *
from tengi import *

from liker.setup import constants
from liker.command.params import command_params
Expand Down
2 changes: 1 addition & 1 deletion liker/setup/logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def setup_logs():
'level': 'DEBUG',
'propagate': True,
},
'tengine': {
'tengi': {
'handlers': ['console', 'file', 'error'],
'level': 'DEBUG',
'propagate': True,
Expand Down
4 changes: 2 additions & 2 deletions liker/state/channel_state.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pathlib import Path
import inject
from tengine.state.timed_preserver import TimedPreserver
from tengine import Config
from tengi.state.timed_preserver import TimedPreserver
from tengi import Config

from liker.state.reaction_hashes import ReactionHashes
from liker.state.markup_queue import MarkupQueue
Expand Down
2 changes: 1 addition & 1 deletion liker/state/comment_trail.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from jsonstore import JsonStore
from typing import Optional
from typeguard import typechecked
from tengine import Config
from tengi import Config

logger = logging.getLogger(__file__)

Expand Down
4 changes: 2 additions & 2 deletions liker/state/enabled_channels.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typeguard import typechecked
from typing import List, Optional
from tengine.state.preserver import *
from tengine import telegram_bot_utils
from tengi.state.preserver import *
from tengi import telegram_bot_utils


class EnabledChannels(Preserver):
Expand Down
2 changes: 1 addition & 1 deletion liker/state/markup_trail.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from jsonstore import JsonStore
from typing import Optional
from typeguard import typechecked
from tengine import Config
from tengi import Config

logger = logging.getLogger(__file__)

Expand Down
4 changes: 2 additions & 2 deletions liker/state/reaction_hashes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import inject
from tengine import Config
from tengine.state.timed_preserver import *
from tengi import Config
from tengi.state.timed_preserver import *


class ReactionHashes(TimedPreserver):
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ rsa==4.7.2
Telethon==1.21.1
typeguard==2.12.0
urllib3==1.26.4
tengi
1 change: 1 addition & 0 deletions requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ requests==2.25.1
six==1.15.0
toml==0.10.2
urllib3==1.26.3
tengi
1 change: 0 additions & 1 deletion tengine
Submodule tengine deleted from 120835
4 changes: 2 additions & 2 deletions tests/test_integrated_ping.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import pytest
from pathlib import Path
from telebot import TeleBot
from tengine.app import App
from tengine.tests.test_utils import get_telegram_message_update
from tengi.app import App
from tengi.tests.test_utils import get_telegram_message_update


@pytest.fixture()
Expand Down

0 comments on commit beb1c7f

Please sign in to comment.