Skip to content

Commit

Permalink
replace dbt.common with dbt_common
Browse files Browse the repository at this point in the history
  • Loading branch information
colin-rogers-dbt committed Jan 12, 2024
1 parent f216bb6 commit dfd5885
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion dbt/adapters/spark/column.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Any, Dict, Optional, TypeVar, Union

from dbt.adapters.base.column import Column
from dbt.common.dataclass_schema import dbtClassMixin
from dbt_common.dataclass_schema import dbtClassMixin

Self = TypeVar("Self", bound="SparkColumn")

Expand Down
6 changes: 3 additions & 3 deletions dbt/adapters/spark/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
from dbt.adapters.events.logging import AdapterLogger
from dbt.adapters.exceptions import FailedToConnectError
from dbt.adapters.sql import SQLConnectionManager
from dbt.common.exceptions import DbtConfigError, DbtRuntimeError, DbtDatabaseError
from dbt_common.exceptions import DbtConfigError, DbtRuntimeError, DbtDatabaseError

from dbt.common.utils.encoding import DECIMALS
from dbt_common.utils.encoding import DECIMALS
from dbt.adapters.spark import __version__

try:
Expand All @@ -24,7 +24,7 @@
pyodbc = None
from datetime import datetime
import sqlparams
from dbt.common.dataclass_schema import StrEnum
from dbt_common.dataclass_schema import StrEnum
from dataclasses import dataclass, field
from typing import Any, Dict, Optional, Union, Tuple, List, Generator, Iterable, Sequence

Expand Down
8 changes: 4 additions & 4 deletions dbt/adapters/spark/impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
from dbt.adapters.base.relation import InformationSchema
from dbt.adapters.contracts.connection import AdapterResponse
from dbt.adapters.events.logging import AdapterLogger
from dbt.common.exceptions import DbtRuntimeError, CompilationError
from dbt.common.utils import AttrDict, executor
from dbt_common.exceptions import DbtRuntimeError, CompilationError
from dbt_common.utils import AttrDict, executor

from typing_extensions import TypeAlias

Expand All @@ -38,8 +38,8 @@
)
from dbt.adapters.base import BaseRelation
from dbt.adapters.contracts.relation import RelationType, RelationConfig
from dbt.common.clients.agate_helper import DEFAULT_TYPE_TESTER
from dbt.common.contracts.constraints import ConstraintType
from dbt_common.clients.agate_helper import DEFAULT_TYPE_TESTER
from dbt_common.contracts.constraints import ConstraintType

logger = AdapterLogger("Spark")
packages = ["pyhive.hive", "thrift.transport", "thrift.protocol"]
Expand Down
2 changes: 1 addition & 1 deletion dbt/adapters/spark/python_submissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import uuid

from dbt.adapters.base import PythonJobHelper
from dbt.common.exceptions import DbtRuntimeError
from dbt_common.exceptions import DbtRuntimeError

from dbt.adapters.spark import SparkCredentials
from dbt.adapters.spark import __version__
Expand Down
2 changes: 1 addition & 1 deletion dbt/adapters/spark/relation.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from dbt.adapters.base.relation import BaseRelation, Policy
from dbt.adapters.events.logging import AdapterLogger

from dbt.common.exceptions import DbtRuntimeError
from dbt_common.exceptions import DbtRuntimeError

logger = AdapterLogger("Spark")

Expand Down
4 changes: 2 additions & 2 deletions dbt/adapters/spark/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

from dbt.adapters.spark.connections import SparkConnectionWrapper
from dbt.adapters.events.logging import AdapterLogger
from dbt.common.utils.encoding import DECIMALS
from dbt.common.exceptions import DbtRuntimeError
from dbt_common.utils.encoding import DECIMALS
from dbt_common.exceptions import DbtRuntimeError
from pyspark.sql import DataFrame, Row, SparkSession
from pyspark.sql.utils import AnalysisException

Expand Down
4 changes: 2 additions & 2 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# install latest changes in dbt-core
# TODO: how to automate switching from develop to version branches?
git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core
git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-tests-adapter&subdirectory=tests/adapter
git+https://github.com/dbt-labs/dbt-core.git@er/remove-common-req-keep-legacy-logger#egg=dbt-core&subdirectory=core
git+https://github.com/dbt-labs/dbt-core.git@er/remove-common-req-keep-legacy-logger#egg=dbt-tests-adapter&subdirectory=tests/adapter

# if version 1.x or greater -> pin to major version
# if version 0.x -> pin to minor
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import agate
import pytest
from dbt.common.dataclass_schema import ValidationError
from dbt_common.dataclass_schema import ValidationError
from dbt.config.project import PartialProject


Expand Down

0 comments on commit dfd5885

Please sign in to comment.