Skip to content

Commit

Permalink
Refactoring python namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
akadlec committed Jan 23, 2022
1 parent 9def022 commit 62bed80
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ python_tests:
python -m unittest

python_coverage:
coverage run --source=fb_redisdb_exchange_plugin -m unittest
coverage run --source=fastybird_redisdb_exchange_plugin -m unittest
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"clue/redis-protocol": "^0.3",
"cweagans/composer-patches": "^1.7",
"fastybird/datetime-factory": "^0.3",
"fastybird/exchange": "^0.14",
"fastybird/metadata": "^0.34",
"fastybird/exchange": "^0.16",
"fastybird/metadata": "^0.36",
"fastybird/socket-server-factory": "^0.4",
"nette/bootstrap": "^3.0",
"nette/di": "^3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
Redis DB exchange plugin
"""

__version__ = "0.18.0"
__version__ = "0.19.0"
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
from typing import Dict, Optional, Union

# Library dependencies
from fb_exchange.consumer import Consumer as ExchangeConsumer
from fb_exchange.publisher import Publisher as ExchangePublisher
from fastybird_exchange.consumer import Consumer as ExchangeConsumer
from fastybird_exchange.publisher import Publisher as ExchangePublisher
from kink import di
from redis import Redis
from whistle import EventDispatcher

# Library libs
from fb_redisdb_exchange_plugin.client import Client
from fb_redisdb_exchange_plugin.connection import Connection
from fb_redisdb_exchange_plugin.logger import Logger
from fb_redisdb_exchange_plugin.publisher import Publisher
from fastybird_redisdb_exchange_plugin.client import Client
from fastybird_redisdb_exchange_plugin.connection import Connection
from fastybird_redisdb_exchange_plugin.logger import Logger
from fastybird_redisdb_exchange_plugin.publisher import Publisher


def register_services(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@
from typing import Dict, Optional

# Library dependencies
import fb_metadata.exceptions as metadata_exceptions
from fb_exchange.client import IClient
from fb_exchange.consumer import Consumer
from fb_metadata.loader import load_schema_by_routing_key
from fb_metadata.routing import RoutingKey
from fb_metadata.types import ModuleOrigin
from fb_metadata.validator import validate
import fastybird_metadata.exceptions as metadata_exceptions
from fastybird_exchange.client import IClient
from fastybird_exchange.consumer import Consumer
from fastybird_metadata.loader import load_schema_by_routing_key
from fastybird_metadata.routing import RoutingKey
from fastybird_metadata.types import ModuleOrigin
from fastybird_metadata.validator import validate
from kink import inject
from whistle import EventDispatcher

# Library libs
from fb_redisdb_exchange_plugin.connection import Connection
from fb_redisdb_exchange_plugin.events import (
from fastybird_redisdb_exchange_plugin.connection import Connection
from fastybird_redisdb_exchange_plugin.events import (
AfterMessageHandledEvent,
BeforeMessageHandledEvent,
)
from fb_redisdb_exchange_plugin.exceptions import (
from fastybird_redisdb_exchange_plugin.exceptions import (
HandleDataException,
HandleRequestException,
)
from fb_redisdb_exchange_plugin.logger import Logger
from fastybird_redisdb_exchange_plugin.logger import Logger


@inject(alias=IClient)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
from whistle import EventDispatcher

# Library libs
from fb_redisdb_exchange_plugin.events import ConnectionClosedEventEvent
from fb_redisdb_exchange_plugin.exceptions import InvalidStateException
from fb_redisdb_exchange_plugin.logger import Logger
from fastybird_redisdb_exchange_plugin.events import ConnectionClosedEventEvent
from fastybird_redisdb_exchange_plugin.exceptions import InvalidStateException
from fastybird_redisdb_exchange_plugin.logger import Logger


class Connection(Redis): # pylint: disable=abstract-method,too-many-ancestors
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
from typing import Dict, Optional, Union

# Library dependencies
from fb_exchange.publisher import IPublisher
from fb_metadata.routing import RoutingKey
from fb_metadata.types import ConnectorOrigin, ModuleOrigin, PluginOrigin
from fastybird_exchange.publisher import IPublisher
from fastybird_metadata.routing import RoutingKey
from fastybird_metadata.types import ConnectorOrigin, ModuleOrigin, PluginOrigin
from redis import Redis

# Library libs
from fb_redisdb_exchange_plugin.logger import Logger
from fastybird_redisdb_exchange_plugin.logger import Logger


class Publisher(IPublisher): # pylint: disable=too-few-public-methods
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
redis>=3.5
fastybird-exchange>=0.14
fastybird-metadata>=0.34
fastybird-exchange>=0.16
fastybird-metadata>=0.36
kink>=0.6
setuptools>=57.4
whistle>=1.0
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def find_version(*file_paths):
raise RuntimeError("Unable to find version string.")


VERSION: str = find_version("fb_redisdb_exchange_plugin", "__init__.py")
VERSION: str = find_version("fastybird_redisdb_exchange_plugin", "__init__.py")

setup(
version=VERSION,
Expand All @@ -57,7 +57,7 @@ def find_version(*file_paths):
long_description_content_type="text/markdown",
python_requires=">=3.7",
packages=find_packages(),
package_data={"fb_redisdb_exchange_plugin": ["py.typed"]},
package_data={"fastybird_redisdb_exchange_plugin": ["py.typed"]},
install_requires=[
"exchange",
"fastybird-exchange",
Expand Down
10 changes: 5 additions & 5 deletions tests/pytests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

# Library dependencies
from kink import inject
from fb_metadata.types import ModuleOrigin
from fb_metadata.routing import RoutingKey
from fastybird_metadata.types import ModuleOrigin
from fastybird_metadata.routing import RoutingKey
from unittest.mock import patch

# Library libs
from fb_redisdb_exchange_plugin.bootstrap import register_services
from fb_redisdb_exchange_plugin.connection import Connection
from fb_redisdb_exchange_plugin.publisher import Publisher
from fastybird_redisdb_exchange_plugin.bootstrap import register_services
from fastybird_redisdb_exchange_plugin.connection import Connection
from fastybird_redisdb_exchange_plugin.publisher import Publisher


class TestPublisher(unittest.TestCase):
Expand Down

0 comments on commit 62bed80

Please sign in to comment.