From 2be6fc96c1d9d86713ed4ebbe80606a2d5694e77 Mon Sep 17 00:00:00 2001 From: Pascal Cadotte Michaud Date: Thu, 18 Jul 2024 11:39:44 -0400 Subject: [PATCH] rename package xivo to wazo --- {xivo => wazo}/__init__.py | 0 {xivo => wazo}/agi.py | 0 {xivo => wazo}/agitb.py | 0 {xivo => wazo}/asterisk/__init__.py | 0 {xivo => wazo}/asterisk/line_identity.py | 0 {xivo => wazo}/asterisk/protocol_interface.py | 0 {xivo => wazo}/asterisk/tests/__init__.py | 0 {xivo => wazo}/asterisk/tests/test_line_identity.py | 0 {xivo => wazo}/asterisk/tests/test_protocol_interface.py | 0 {xivo => wazo}/auth_verifier.py | 0 {xivo => wazo}/caller_id.py | 0 {xivo => wazo}/chain_map.py | 0 {xivo => wazo}/cli/__init__.py | 0 {xivo => wazo}/cli/command/__init__.py | 0 {xivo => wazo}/cli/command/base.py | 0 {xivo => wazo}/cli/command/exit.py | 0 {xivo => wazo}/cli/command/help.py | 0 {xivo => wazo}/cli/command/unknown.py | 0 {xivo => wazo}/cli/commandline.py | 0 {xivo => wazo}/cli/completion/__init__.py | 0 {xivo => wazo}/cli/completion/completer.py | 0 {xivo => wazo}/cli/completion/readline.py | 0 {xivo => wazo}/cli/completion/tests/__init__.py | 0 {xivo => wazo}/cli/completion/tests/test_completer.py | 1 - {xivo => wazo}/cli/errorhandler.py | 0 {xivo => wazo}/cli/exception.py | 0 {xivo => wazo}/cli/executor.py | 0 {xivo => wazo}/cli/facade.py | 0 {xivo => wazo}/cli/history.py | 0 {xivo => wazo}/cli/parser.py | 0 {xivo => wazo}/cli/registry.py | 0 {xivo => wazo}/cli/source/__init__.py | 0 {xivo => wazo}/cli/source/input.py | 0 {xivo => wazo}/cli/tests/__init__.py | 0 {xivo => wazo}/cli/tests/test_parser.py | 1 - {xivo => wazo}/cli/tests/test_registry.py | 1 - {xivo => wazo}/cli/tests/test_utils.py | 0 {xivo => wazo}/cli/utils.py | 0 {xivo => wazo}/config_helper.py | 0 {xivo => wazo}/consul_helpers.py | 0 {xivo => wazo}/daemonize.py | 0 {xivo => wazo}/db_helper.py | 0 {xivo => wazo}/debug.py | 0 {xivo => wazo}/dialaction.py | 0 {xivo => wazo}/flask/__init__.py | 0 {xivo => wazo}/flask/auth_verifier.py | 0 {xivo => wazo}/flask/headers.py | 0 {xivo => wazo}/flask/tests/__init__.py | 0 {xivo => wazo}/flask/tests/test_auth_verifier.py | 1 - {xivo => wazo}/http_exceptions.py | 1 - {xivo => wazo}/http_helpers.py | 0 {xivo => wazo}/mallow/__init__.py | 0 {xivo => wazo}/mallow/fields.py | 0 {xivo => wazo}/mallow/tests/__init__.py | 0 {xivo => wazo}/mallow/tests/test_fields.py | 0 {xivo => wazo}/mallow/tests/test_validate.py | 0 {xivo => wazo}/mallow/validate.py | 0 {xivo => wazo}/mallow_helpers.py | 0 {xivo => wazo}/moresynchro.py | 0 {xivo => wazo}/permission.py | 0 {xivo => wazo}/plugin_helpers.py | 0 {xivo => wazo}/pubsub.py | 0 {xivo => wazo}/rest_api_helpers.py | 0 {xivo => wazo}/status.py | 0 {xivo => wazo}/system.py | 0 {xivo => wazo}/tenant_flask_helpers.py | 5 ++--- {xivo => wazo}/tenant_helpers.py | 1 - {xivo => wazo}/tests/__init__.py | 0 {xivo => wazo}/tests/test_auth_verifier.py | 0 {xivo => wazo}/tests/test_caller_id.py | 1 - {xivo => wazo}/tests/test_chain_map.py | 0 {xivo => wazo}/tests/test_config_helper.py | 0 {xivo => wazo}/tests/test_consul_helpers.py | 0 {xivo => wazo}/tests/test_daemonize.py | 0 {xivo => wazo}/tests/test_dialaction.py | 0 {xivo => wazo}/tests/test_http_helpers.py | 1 - {xivo => wazo}/tests/test_mallow_helpers.py | 0 {xivo => wazo}/tests/test_permission.py | 0 {xivo => wazo}/tests/test_pubsub.py | 0 {xivo => wazo}/tests/test_rest_api_helpers.py | 0 {xivo => wazo}/tests/test_tenant_flask_helpers.py | 0 {xivo => wazo}/tests/test_tenant_helpers.py | 1 - {xivo => wazo}/tests/test_token_renewer.py | 0 {xivo => wazo}/tests/test_user_rights.py | 0 {xivo => wazo}/tests/test_xivo_helpers.py | 0 {xivo => wazo}/tests/test_xivo_logging.py | 1 - {xivo => wazo}/token_renewer.py | 0 {xivo => wazo}/user_rights.py | 0 {xivo => wazo}/xivo_helpers.py | 0 {xivo => wazo}/xivo_logging.py | 0 90 files changed, 2 insertions(+), 13 deletions(-) rename {xivo => wazo}/__init__.py (100%) rename {xivo => wazo}/agi.py (100%) rename {xivo => wazo}/agitb.py (100%) rename {xivo => wazo}/asterisk/__init__.py (100%) rename {xivo => wazo}/asterisk/line_identity.py (100%) rename {xivo => wazo}/asterisk/protocol_interface.py (100%) rename {xivo => wazo}/asterisk/tests/__init__.py (100%) rename {xivo => wazo}/asterisk/tests/test_line_identity.py (100%) rename {xivo => wazo}/asterisk/tests/test_protocol_interface.py (100%) rename {xivo => wazo}/auth_verifier.py (100%) rename {xivo => wazo}/caller_id.py (100%) rename {xivo => wazo}/chain_map.py (100%) rename {xivo => wazo}/cli/__init__.py (100%) rename {xivo => wazo}/cli/command/__init__.py (100%) rename {xivo => wazo}/cli/command/base.py (100%) rename {xivo => wazo}/cli/command/exit.py (100%) rename {xivo => wazo}/cli/command/help.py (100%) rename {xivo => wazo}/cli/command/unknown.py (100%) rename {xivo => wazo}/cli/commandline.py (100%) rename {xivo => wazo}/cli/completion/__init__.py (100%) rename {xivo => wazo}/cli/completion/completer.py (100%) rename {xivo => wazo}/cli/completion/readline.py (100%) rename {xivo => wazo}/cli/completion/tests/__init__.py (100%) rename {xivo => wazo}/cli/completion/tests/test_completer.py (99%) rename {xivo => wazo}/cli/errorhandler.py (100%) rename {xivo => wazo}/cli/exception.py (100%) rename {xivo => wazo}/cli/executor.py (100%) rename {xivo => wazo}/cli/facade.py (100%) rename {xivo => wazo}/cli/history.py (100%) rename {xivo => wazo}/cli/parser.py (100%) rename {xivo => wazo}/cli/registry.py (100%) rename {xivo => wazo}/cli/source/__init__.py (100%) rename {xivo => wazo}/cli/source/input.py (100%) rename {xivo => wazo}/cli/tests/__init__.py (100%) rename {xivo => wazo}/cli/tests/test_parser.py (99%) rename {xivo => wazo}/cli/tests/test_registry.py (99%) rename {xivo => wazo}/cli/tests/test_utils.py (100%) rename {xivo => wazo}/cli/utils.py (100%) rename {xivo => wazo}/config_helper.py (100%) rename {xivo => wazo}/consul_helpers.py (100%) rename {xivo => wazo}/daemonize.py (100%) rename {xivo => wazo}/db_helper.py (100%) rename {xivo => wazo}/debug.py (100%) rename {xivo => wazo}/dialaction.py (100%) rename {xivo => wazo}/flask/__init__.py (100%) rename {xivo => wazo}/flask/auth_verifier.py (100%) rename {xivo => wazo}/flask/headers.py (100%) rename {xivo => wazo}/flask/tests/__init__.py (100%) rename {xivo => wazo}/flask/tests/test_auth_verifier.py (99%) rename {xivo => wazo}/http_exceptions.py (99%) rename {xivo => wazo}/http_helpers.py (100%) rename {xivo => wazo}/mallow/__init__.py (100%) rename {xivo => wazo}/mallow/fields.py (100%) rename {xivo => wazo}/mallow/tests/__init__.py (100%) rename {xivo => wazo}/mallow/tests/test_fields.py (100%) rename {xivo => wazo}/mallow/tests/test_validate.py (100%) rename {xivo => wazo}/mallow/validate.py (100%) rename {xivo => wazo}/mallow_helpers.py (100%) rename {xivo => wazo}/moresynchro.py (100%) rename {xivo => wazo}/permission.py (100%) rename {xivo => wazo}/plugin_helpers.py (100%) rename {xivo => wazo}/pubsub.py (100%) rename {xivo => wazo}/rest_api_helpers.py (100%) rename {xivo => wazo}/status.py (100%) rename {xivo => wazo}/system.py (100%) rename {xivo => wazo}/tenant_flask_helpers.py (95%) rename {xivo => wazo}/tenant_helpers.py (99%) rename {xivo => wazo}/tests/__init__.py (100%) rename {xivo => wazo}/tests/test_auth_verifier.py (100%) rename {xivo => wazo}/tests/test_caller_id.py (99%) rename {xivo => wazo}/tests/test_chain_map.py (100%) rename {xivo => wazo}/tests/test_config_helper.py (100%) rename {xivo => wazo}/tests/test_consul_helpers.py (100%) rename {xivo => wazo}/tests/test_daemonize.py (100%) rename {xivo => wazo}/tests/test_dialaction.py (100%) rename {xivo => wazo}/tests/test_http_helpers.py (99%) rename {xivo => wazo}/tests/test_mallow_helpers.py (100%) rename {xivo => wazo}/tests/test_permission.py (100%) rename {xivo => wazo}/tests/test_pubsub.py (100%) rename {xivo => wazo}/tests/test_rest_api_helpers.py (100%) rename {xivo => wazo}/tests/test_tenant_flask_helpers.py (100%) rename {xivo => wazo}/tests/test_tenant_helpers.py (99%) rename {xivo => wazo}/tests/test_token_renewer.py (100%) rename {xivo => wazo}/tests/test_user_rights.py (100%) rename {xivo => wazo}/tests/test_xivo_helpers.py (100%) rename {xivo => wazo}/tests/test_xivo_logging.py (99%) rename {xivo => wazo}/token_renewer.py (100%) rename {xivo => wazo}/user_rights.py (100%) rename {xivo => wazo}/xivo_helpers.py (100%) rename {xivo => wazo}/xivo_logging.py (100%) diff --git a/xivo/__init__.py b/wazo/__init__.py similarity index 100% rename from xivo/__init__.py rename to wazo/__init__.py diff --git a/xivo/agi.py b/wazo/agi.py similarity index 100% rename from xivo/agi.py rename to wazo/agi.py diff --git a/xivo/agitb.py b/wazo/agitb.py similarity index 100% rename from xivo/agitb.py rename to wazo/agitb.py diff --git a/xivo/asterisk/__init__.py b/wazo/asterisk/__init__.py similarity index 100% rename from xivo/asterisk/__init__.py rename to wazo/asterisk/__init__.py diff --git a/xivo/asterisk/line_identity.py b/wazo/asterisk/line_identity.py similarity index 100% rename from xivo/asterisk/line_identity.py rename to wazo/asterisk/line_identity.py diff --git a/xivo/asterisk/protocol_interface.py b/wazo/asterisk/protocol_interface.py similarity index 100% rename from xivo/asterisk/protocol_interface.py rename to wazo/asterisk/protocol_interface.py diff --git a/xivo/asterisk/tests/__init__.py b/wazo/asterisk/tests/__init__.py similarity index 100% rename from xivo/asterisk/tests/__init__.py rename to wazo/asterisk/tests/__init__.py diff --git a/xivo/asterisk/tests/test_line_identity.py b/wazo/asterisk/tests/test_line_identity.py similarity index 100% rename from xivo/asterisk/tests/test_line_identity.py rename to wazo/asterisk/tests/test_line_identity.py diff --git a/xivo/asterisk/tests/test_protocol_interface.py b/wazo/asterisk/tests/test_protocol_interface.py similarity index 100% rename from xivo/asterisk/tests/test_protocol_interface.py rename to wazo/asterisk/tests/test_protocol_interface.py diff --git a/xivo/auth_verifier.py b/wazo/auth_verifier.py similarity index 100% rename from xivo/auth_verifier.py rename to wazo/auth_verifier.py diff --git a/xivo/caller_id.py b/wazo/caller_id.py similarity index 100% rename from xivo/caller_id.py rename to wazo/caller_id.py diff --git a/xivo/chain_map.py b/wazo/chain_map.py similarity index 100% rename from xivo/chain_map.py rename to wazo/chain_map.py diff --git a/xivo/cli/__init__.py b/wazo/cli/__init__.py similarity index 100% rename from xivo/cli/__init__.py rename to wazo/cli/__init__.py diff --git a/xivo/cli/command/__init__.py b/wazo/cli/command/__init__.py similarity index 100% rename from xivo/cli/command/__init__.py rename to wazo/cli/command/__init__.py diff --git a/xivo/cli/command/base.py b/wazo/cli/command/base.py similarity index 100% rename from xivo/cli/command/base.py rename to wazo/cli/command/base.py diff --git a/xivo/cli/command/exit.py b/wazo/cli/command/exit.py similarity index 100% rename from xivo/cli/command/exit.py rename to wazo/cli/command/exit.py diff --git a/xivo/cli/command/help.py b/wazo/cli/command/help.py similarity index 100% rename from xivo/cli/command/help.py rename to wazo/cli/command/help.py diff --git a/xivo/cli/command/unknown.py b/wazo/cli/command/unknown.py similarity index 100% rename from xivo/cli/command/unknown.py rename to wazo/cli/command/unknown.py diff --git a/xivo/cli/commandline.py b/wazo/cli/commandline.py similarity index 100% rename from xivo/cli/commandline.py rename to wazo/cli/commandline.py diff --git a/xivo/cli/completion/__init__.py b/wazo/cli/completion/__init__.py similarity index 100% rename from xivo/cli/completion/__init__.py rename to wazo/cli/completion/__init__.py diff --git a/xivo/cli/completion/completer.py b/wazo/cli/completion/completer.py similarity index 100% rename from xivo/cli/completion/completer.py rename to wazo/cli/completion/completer.py diff --git a/xivo/cli/completion/readline.py b/wazo/cli/completion/readline.py similarity index 100% rename from xivo/cli/completion/readline.py rename to wazo/cli/completion/readline.py diff --git a/xivo/cli/completion/tests/__init__.py b/wazo/cli/completion/tests/__init__.py similarity index 100% rename from xivo/cli/completion/tests/__init__.py rename to wazo/cli/completion/tests/__init__.py diff --git a/xivo/cli/completion/tests/test_completer.py b/wazo/cli/completion/tests/test_completer.py similarity index 99% rename from xivo/cli/completion/tests/test_completer.py rename to wazo/cli/completion/tests/test_completer.py index db33e12c..273f0ebd 100644 --- a/xivo/cli/completion/tests/test_completer.py +++ b/wazo/cli/completion/tests/test_completer.py @@ -6,7 +6,6 @@ from unittest.mock import Mock from hamcrest import assert_that, equal_to - from xivo.cli.completion.completer import CommandLineCompleter from xivo.cli.registry import CommandRegistry diff --git a/xivo/cli/errorhandler.py b/wazo/cli/errorhandler.py similarity index 100% rename from xivo/cli/errorhandler.py rename to wazo/cli/errorhandler.py diff --git a/xivo/cli/exception.py b/wazo/cli/exception.py similarity index 100% rename from xivo/cli/exception.py rename to wazo/cli/exception.py diff --git a/xivo/cli/executor.py b/wazo/cli/executor.py similarity index 100% rename from xivo/cli/executor.py rename to wazo/cli/executor.py diff --git a/xivo/cli/facade.py b/wazo/cli/facade.py similarity index 100% rename from xivo/cli/facade.py rename to wazo/cli/facade.py diff --git a/xivo/cli/history.py b/wazo/cli/history.py similarity index 100% rename from xivo/cli/history.py rename to wazo/cli/history.py diff --git a/xivo/cli/parser.py b/wazo/cli/parser.py similarity index 100% rename from xivo/cli/parser.py rename to wazo/cli/parser.py diff --git a/xivo/cli/registry.py b/wazo/cli/registry.py similarity index 100% rename from xivo/cli/registry.py rename to wazo/cli/registry.py diff --git a/xivo/cli/source/__init__.py b/wazo/cli/source/__init__.py similarity index 100% rename from xivo/cli/source/__init__.py rename to wazo/cli/source/__init__.py diff --git a/xivo/cli/source/input.py b/wazo/cli/source/input.py similarity index 100% rename from xivo/cli/source/input.py rename to wazo/cli/source/input.py diff --git a/xivo/cli/tests/__init__.py b/wazo/cli/tests/__init__.py similarity index 100% rename from xivo/cli/tests/__init__.py rename to wazo/cli/tests/__init__.py diff --git a/xivo/cli/tests/test_parser.py b/wazo/cli/tests/test_parser.py similarity index 99% rename from xivo/cli/tests/test_parser.py rename to wazo/cli/tests/test_parser.py index d412a3a4..1c2ac8a3 100644 --- a/xivo/cli/tests/test_parser.py +++ b/wazo/cli/tests/test_parser.py @@ -6,7 +6,6 @@ from unittest.mock import Mock from hamcrest import assert_that, equal_to, none - from xivo.cli.exception import NoMatchingCommandError from xivo.cli.parser import RawCommandLineParser from xivo.cli.registry import CommandRegistry diff --git a/xivo/cli/tests/test_registry.py b/wazo/cli/tests/test_registry.py similarity index 99% rename from xivo/cli/tests/test_registry.py rename to wazo/cli/tests/test_registry.py index ea2d44c1..39a09eb5 100644 --- a/xivo/cli/tests/test_registry.py +++ b/wazo/cli/tests/test_registry.py @@ -6,7 +6,6 @@ from unittest.mock import Mock from hamcrest import assert_that, contains_inanyorder, equal_to - from xivo.cli.exception import CommandAlreadyRegisteredError, NoMatchingCommandError from xivo.cli.registry import CommandRegistry diff --git a/xivo/cli/tests/test_utils.py b/wazo/cli/tests/test_utils.py similarity index 100% rename from xivo/cli/tests/test_utils.py rename to wazo/cli/tests/test_utils.py diff --git a/xivo/cli/utils.py b/wazo/cli/utils.py similarity index 100% rename from xivo/cli/utils.py rename to wazo/cli/utils.py diff --git a/xivo/config_helper.py b/wazo/config_helper.py similarity index 100% rename from xivo/config_helper.py rename to wazo/config_helper.py diff --git a/xivo/consul_helpers.py b/wazo/consul_helpers.py similarity index 100% rename from xivo/consul_helpers.py rename to wazo/consul_helpers.py diff --git a/xivo/daemonize.py b/wazo/daemonize.py similarity index 100% rename from xivo/daemonize.py rename to wazo/daemonize.py diff --git a/xivo/db_helper.py b/wazo/db_helper.py similarity index 100% rename from xivo/db_helper.py rename to wazo/db_helper.py diff --git a/xivo/debug.py b/wazo/debug.py similarity index 100% rename from xivo/debug.py rename to wazo/debug.py diff --git a/xivo/dialaction.py b/wazo/dialaction.py similarity index 100% rename from xivo/dialaction.py rename to wazo/dialaction.py diff --git a/xivo/flask/__init__.py b/wazo/flask/__init__.py similarity index 100% rename from xivo/flask/__init__.py rename to wazo/flask/__init__.py diff --git a/xivo/flask/auth_verifier.py b/wazo/flask/auth_verifier.py similarity index 100% rename from xivo/flask/auth_verifier.py rename to wazo/flask/auth_verifier.py diff --git a/xivo/flask/headers.py b/wazo/flask/headers.py similarity index 100% rename from xivo/flask/headers.py rename to wazo/flask/headers.py diff --git a/xivo/flask/tests/__init__.py b/wazo/flask/tests/__init__.py similarity index 100% rename from xivo/flask/tests/__init__.py rename to wazo/flask/tests/__init__.py diff --git a/xivo/flask/tests/test_auth_verifier.py b/wazo/flask/tests/test_auth_verifier.py similarity index 99% rename from xivo/flask/tests/test_auth_verifier.py rename to wazo/flask/tests/test_auth_verifier.py index 3272a585..099723ad 100644 --- a/xivo/flask/tests/test_auth_verifier.py +++ b/wazo/flask/tests/test_auth_verifier.py @@ -6,7 +6,6 @@ from unittest.mock import sentinel as s import pytest - from xivo.auth_verifier import Unauthorized, no_auth, required_acl, required_tenant from xivo.http_exceptions import InvalidTokenAPIException diff --git a/xivo/http_exceptions.py b/wazo/http_exceptions.py similarity index 99% rename from xivo/http_exceptions.py rename to wazo/http_exceptions.py index f196229a..d4eeea59 100644 --- a/xivo/http_exceptions.py +++ b/wazo/http_exceptions.py @@ -3,7 +3,6 @@ from __future__ import annotations import requests - from xivo import rest_api_helpers diff --git a/xivo/http_helpers.py b/wazo/http_helpers.py similarity index 100% rename from xivo/http_helpers.py rename to wazo/http_helpers.py diff --git a/xivo/mallow/__init__.py b/wazo/mallow/__init__.py similarity index 100% rename from xivo/mallow/__init__.py rename to wazo/mallow/__init__.py diff --git a/xivo/mallow/fields.py b/wazo/mallow/fields.py similarity index 100% rename from xivo/mallow/fields.py rename to wazo/mallow/fields.py diff --git a/xivo/mallow/tests/__init__.py b/wazo/mallow/tests/__init__.py similarity index 100% rename from xivo/mallow/tests/__init__.py rename to wazo/mallow/tests/__init__.py diff --git a/xivo/mallow/tests/test_fields.py b/wazo/mallow/tests/test_fields.py similarity index 100% rename from xivo/mallow/tests/test_fields.py rename to wazo/mallow/tests/test_fields.py diff --git a/xivo/mallow/tests/test_validate.py b/wazo/mallow/tests/test_validate.py similarity index 100% rename from xivo/mallow/tests/test_validate.py rename to wazo/mallow/tests/test_validate.py diff --git a/xivo/mallow/validate.py b/wazo/mallow/validate.py similarity index 100% rename from xivo/mallow/validate.py rename to wazo/mallow/validate.py diff --git a/xivo/mallow_helpers.py b/wazo/mallow_helpers.py similarity index 100% rename from xivo/mallow_helpers.py rename to wazo/mallow_helpers.py diff --git a/xivo/moresynchro.py b/wazo/moresynchro.py similarity index 100% rename from xivo/moresynchro.py rename to wazo/moresynchro.py diff --git a/xivo/permission.py b/wazo/permission.py similarity index 100% rename from xivo/permission.py rename to wazo/permission.py diff --git a/xivo/plugin_helpers.py b/wazo/plugin_helpers.py similarity index 100% rename from xivo/plugin_helpers.py rename to wazo/plugin_helpers.py diff --git a/xivo/pubsub.py b/wazo/pubsub.py similarity index 100% rename from xivo/pubsub.py rename to wazo/pubsub.py diff --git a/xivo/rest_api_helpers.py b/wazo/rest_api_helpers.py similarity index 100% rename from xivo/rest_api_helpers.py rename to wazo/rest_api_helpers.py diff --git a/xivo/status.py b/wazo/status.py similarity index 100% rename from xivo/status.py rename to wazo/status.py diff --git a/xivo/system.py b/wazo/system.py similarity index 100% rename from xivo/system.py rename to wazo/system.py diff --git a/xivo/tenant_flask_helpers.py b/wazo/tenant_flask_helpers.py similarity index 95% rename from xivo/tenant_flask_helpers.py rename to wazo/tenant_flask_helpers.py index 97b8e51a..486ad6ba 100644 --- a/xivo/tenant_flask_helpers.py +++ b/wazo/tenant_flask_helpers.py @@ -8,7 +8,6 @@ from flask import current_app, g from wazo_auth_client import Client as AuthClient from werkzeug.local import LocalProxy - from xivo.tenant_helpers import Token, User from . import tenant_helpers @@ -43,7 +42,7 @@ def get_token() -> Token: return token -token: Token = LocalProxy(get_token) # type: ignore[assignment] +token: Token = LocalProxy(get_token) def get_user() -> User: @@ -53,7 +52,7 @@ def get_user() -> User: return user -user: User = LocalProxy(get_user) # type: ignore[assignment] +user: User = LocalProxy(get_user) Self = TypeVar('Self', bound='Tenant') diff --git a/xivo/tenant_helpers.py b/wazo/tenant_helpers.py similarity index 99% rename from xivo/tenant_helpers.py rename to wazo/tenant_helpers.py index 350b285a..71e723ac 100644 --- a/xivo/tenant_helpers.py +++ b/wazo/tenant_helpers.py @@ -5,7 +5,6 @@ from typing import TYPE_CHECKING, Any, TypeVar import requests - from xivo import rest_api_helpers from xivo.http_exceptions import AuthServerUnreachable, InvalidTokenAPIException diff --git a/xivo/tests/__init__.py b/wazo/tests/__init__.py similarity index 100% rename from xivo/tests/__init__.py rename to wazo/tests/__init__.py diff --git a/xivo/tests/test_auth_verifier.py b/wazo/tests/test_auth_verifier.py similarity index 100% rename from xivo/tests/test_auth_verifier.py rename to wazo/tests/test_auth_verifier.py diff --git a/xivo/tests/test_caller_id.py b/wazo/tests/test_caller_id.py similarity index 99% rename from xivo/tests/test_caller_id.py rename to wazo/tests/test_caller_id.py index 2da43fab..8e62183d 100644 --- a/xivo/tests/test_caller_id.py +++ b/wazo/tests/test_caller_id.py @@ -4,7 +4,6 @@ import unittest from hamcrest import assert_that, equal_to - from xivo import caller_id from xivo.caller_id import extract_displayname, extract_number, is_complete_caller_id diff --git a/xivo/tests/test_chain_map.py b/wazo/tests/test_chain_map.py similarity index 100% rename from xivo/tests/test_chain_map.py rename to wazo/tests/test_chain_map.py diff --git a/xivo/tests/test_config_helper.py b/wazo/tests/test_config_helper.py similarity index 100% rename from xivo/tests/test_config_helper.py rename to wazo/tests/test_config_helper.py diff --git a/xivo/tests/test_consul_helpers.py b/wazo/tests/test_consul_helpers.py similarity index 100% rename from xivo/tests/test_consul_helpers.py rename to wazo/tests/test_consul_helpers.py diff --git a/xivo/tests/test_daemonize.py b/wazo/tests/test_daemonize.py similarity index 100% rename from xivo/tests/test_daemonize.py rename to wazo/tests/test_daemonize.py diff --git a/xivo/tests/test_dialaction.py b/wazo/tests/test_dialaction.py similarity index 100% rename from xivo/tests/test_dialaction.py rename to wazo/tests/test_dialaction.py diff --git a/xivo/tests/test_http_helpers.py b/wazo/tests/test_http_helpers.py similarity index 99% rename from xivo/tests/test_http_helpers.py rename to wazo/tests/test_http_helpers.py index a93272ea..a22a432a 100644 --- a/xivo/tests/test_http_helpers.py +++ b/wazo/tests/test_http_helpers.py @@ -6,7 +6,6 @@ from unittest.mock import ANY, Mock, patch from hamcrest import assert_that, equal_to - from xivo.http_helpers import ( BodyFormatter, LazyHeaderFormatter, diff --git a/xivo/tests/test_mallow_helpers.py b/wazo/tests/test_mallow_helpers.py similarity index 100% rename from xivo/tests/test_mallow_helpers.py rename to wazo/tests/test_mallow_helpers.py diff --git a/xivo/tests/test_permission.py b/wazo/tests/test_permission.py similarity index 100% rename from xivo/tests/test_permission.py rename to wazo/tests/test_permission.py diff --git a/xivo/tests/test_pubsub.py b/wazo/tests/test_pubsub.py similarity index 100% rename from xivo/tests/test_pubsub.py rename to wazo/tests/test_pubsub.py diff --git a/xivo/tests/test_rest_api_helpers.py b/wazo/tests/test_rest_api_helpers.py similarity index 100% rename from xivo/tests/test_rest_api_helpers.py rename to wazo/tests/test_rest_api_helpers.py diff --git a/xivo/tests/test_tenant_flask_helpers.py b/wazo/tests/test_tenant_flask_helpers.py similarity index 100% rename from xivo/tests/test_tenant_flask_helpers.py rename to wazo/tests/test_tenant_flask_helpers.py diff --git a/xivo/tests/test_tenant_helpers.py b/wazo/tests/test_tenant_helpers.py similarity index 99% rename from xivo/tests/test_tenant_helpers.py rename to wazo/tests/test_tenant_helpers.py index 6a36952b..f5c0b673 100644 --- a/xivo/tests/test_tenant_helpers.py +++ b/wazo/tests/test_tenant_helpers.py @@ -14,7 +14,6 @@ ) from requests import HTTPError, RequestException from wazo_test_helpers.hamcrest.raises import raises - from xivo.auth_verifier import AuthServerUnreachable, InvalidTokenAPIException from ..tenant_helpers import InvalidTenant, Tenant, Token, UnauthorizedTenant diff --git a/xivo/tests/test_token_renewer.py b/wazo/tests/test_token_renewer.py similarity index 100% rename from xivo/tests/test_token_renewer.py rename to wazo/tests/test_token_renewer.py diff --git a/xivo/tests/test_user_rights.py b/wazo/tests/test_user_rights.py similarity index 100% rename from xivo/tests/test_user_rights.py rename to wazo/tests/test_user_rights.py diff --git a/xivo/tests/test_xivo_helpers.py b/wazo/tests/test_xivo_helpers.py similarity index 100% rename from xivo/tests/test_xivo_helpers.py rename to wazo/tests/test_xivo_helpers.py diff --git a/xivo/tests/test_xivo_logging.py b/wazo/tests/test_xivo_logging.py similarity index 99% rename from xivo/tests/test_xivo_logging.py rename to wazo/tests/test_xivo_logging.py index d462b70b..d162cf5f 100644 --- a/xivo/tests/test_xivo_logging.py +++ b/wazo/tests/test_xivo_logging.py @@ -17,7 +17,6 @@ is_, is_not, ) - from xivo.xivo_logging import ( DEFAULT_LOG_FORMAT, DEFAULT_LOG_LEVEL, diff --git a/xivo/token_renewer.py b/wazo/token_renewer.py similarity index 100% rename from xivo/token_renewer.py rename to wazo/token_renewer.py diff --git a/xivo/user_rights.py b/wazo/user_rights.py similarity index 100% rename from xivo/user_rights.py rename to wazo/user_rights.py diff --git a/xivo/xivo_helpers.py b/wazo/xivo_helpers.py similarity index 100% rename from xivo/xivo_helpers.py rename to wazo/xivo_helpers.py diff --git a/xivo/xivo_logging.py b/wazo/xivo_logging.py similarity index 100% rename from xivo/xivo_logging.py rename to wazo/xivo_logging.py