From eb856aeb0421c311ee2f84570e53305b9d49a56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCr=20Akkurt?= Date: Sat, 22 Mar 2025 02:19:56 +0600 Subject: [PATCH] use package as cherry_etl instead of cherry to keep consistency with package name (#38) --- examples/clickhouse/main.py | 6 +++--- examples/deltalake/main.py | 6 +++--- examples/iceberg/main.py | 4 ++-- examples/orca_whirpool/main.py | 6 +++--- examples/pyarrow_dataset_writer/main.py | 6 +++--- examples/solana_token_balances/main.py | 6 +++--- examples/uniswap_v2_swaps/main.py | 6 +++--- pyproject.toml | 5 +---- src/{cherry => cherry_etl}/__init__.py | 0 src/{cherry => cherry_etl}/config.py | 0 src/{cherry => cherry_etl}/pipeline.py | 0 src/{cherry => cherry_etl}/steps/__init__.py | 0 src/{cherry => cherry_etl}/steps/base58_encode.py | 0 src/{cherry => cherry_etl}/steps/cast.py | 0 src/{cherry => cherry_etl}/steps/cast_by_type.py | 0 src/{cherry => cherry_etl}/steps/evm_decode_events.py | 0 src/{cherry => cherry_etl}/steps/evm_validate_block_data.py | 0 src/{cherry => cherry_etl}/steps/hex_encode.py | 0 src/{cherry => cherry_etl}/steps/util.py | 0 src/{cherry => cherry_etl}/writers/__init__.py | 0 src/{cherry => cherry_etl}/writers/base.py | 0 src/{cherry => cherry_etl}/writers/clickhouse.py | 0 src/{cherry => cherry_etl}/writers/delta_lake.py | 0 src/{cherry => cherry_etl}/writers/iceberg.py | 0 src/{cherry => cherry_etl}/writers/pyarrow_dataset.py | 0 src/{cherry => cherry_etl}/writers/writer.py | 0 26 files changed, 21 insertions(+), 24 deletions(-) rename src/{cherry => cherry_etl}/__init__.py (100%) rename src/{cherry => cherry_etl}/config.py (100%) rename src/{cherry => cherry_etl}/pipeline.py (100%) rename src/{cherry => cherry_etl}/steps/__init__.py (100%) rename src/{cherry => cherry_etl}/steps/base58_encode.py (100%) rename src/{cherry => cherry_etl}/steps/cast.py (100%) rename src/{cherry => cherry_etl}/steps/cast_by_type.py (100%) rename src/{cherry => cherry_etl}/steps/evm_decode_events.py (100%) rename src/{cherry => cherry_etl}/steps/evm_validate_block_data.py (100%) rename src/{cherry => cherry_etl}/steps/hex_encode.py (100%) rename src/{cherry => cherry_etl}/steps/util.py (100%) rename src/{cherry => cherry_etl}/writers/__init__.py (100%) rename src/{cherry => cherry_etl}/writers/base.py (100%) rename src/{cherry => cherry_etl}/writers/clickhouse.py (100%) rename src/{cherry => cherry_etl}/writers/delta_lake.py (100%) rename src/{cherry => cherry_etl}/writers/iceberg.py (100%) rename src/{cherry => cherry_etl}/writers/pyarrow_dataset.py (100%) rename src/{cherry => cherry_etl}/writers/writer.py (100%) diff --git a/examples/clickhouse/main.py b/examples/clickhouse/main.py index cb26891..9f03ce7 100644 --- a/examples/clickhouse/main.py +++ b/examples/clickhouse/main.py @@ -1,7 +1,7 @@ from clickhouse_connect.driver.asyncclient import AsyncClient import pyarrow as pa -from cherry import config as cc -from cherry.config import ( +from cherry_etl import config as cc +from cherry_etl.config import ( CastByTypeConfig, ClickHouseSkipIndex, StepKind, @@ -9,7 +9,7 @@ HexEncodeConfig, CastConfig, ) -from cherry import run_pipelines, Context +from cherry_etl import run_pipelines, Context from cherry_core import ingest import logging import os diff --git a/examples/deltalake/main.py b/examples/deltalake/main.py index e2948eb..18bf26f 100644 --- a/examples/deltalake/main.py +++ b/examples/deltalake/main.py @@ -1,13 +1,13 @@ import pyarrow as pa -from cherry import config as cc -from cherry.config import ( +from cherry_etl import config as cc +from cherry_etl.config import ( CastByTypeConfig, StepKind, EvmDecodeEventsConfig, HexEncodeConfig, CastConfig, ) -from cherry import run_pipelines, Context +from cherry_etl import run_pipelines, Context from cherry_core import ingest import logging import os diff --git a/examples/iceberg/main.py b/examples/iceberg/main.py index 4b089df..eed23f8 100644 --- a/examples/iceberg/main.py +++ b/examples/iceberg/main.py @@ -1,5 +1,5 @@ -from cherry import config as cc -from cherry import run_pipelines, Context +from cherry_etl import config as cc +from cherry_etl import run_pipelines, Context from cherry_core import ingest from pyiceberg.catalog.sql import SqlCatalog import logging diff --git a/examples/orca_whirpool/main.py b/examples/orca_whirpool/main.py index 798b8e9..c4f852d 100644 --- a/examples/orca_whirpool/main.py +++ b/examples/orca_whirpool/main.py @@ -1,9 +1,9 @@ -from cherry import config as cc -from cherry.config import ( +from cherry_etl import config as cc +from cherry_etl.config import ( Base58EncodeConfig, StepKind, ) -from cherry import run_pipelines, Context +from cherry_etl import run_pipelines, Context from cherry_core import ingest, base58_encode_bytes import logging import os diff --git a/examples/pyarrow_dataset_writer/main.py b/examples/pyarrow_dataset_writer/main.py index 1331822..ecb2262 100644 --- a/examples/pyarrow_dataset_writer/main.py +++ b/examples/pyarrow_dataset_writer/main.py @@ -1,11 +1,11 @@ -from cherry import config as cc -from cherry.config import ( +from cherry_etl import config as cc +from cherry_etl.config import ( StepKind, EvmDecodeEventsConfig, HexEncodeConfig, CastConfig, ) -from cherry import run_pipelines, Context +from cherry_etl import run_pipelines, Context from cherry_core import ingest import logging import os diff --git a/examples/solana_token_balances/main.py b/examples/solana_token_balances/main.py index e7b04b8..0d81a4f 100644 --- a/examples/solana_token_balances/main.py +++ b/examples/solana_token_balances/main.py @@ -1,9 +1,9 @@ -from cherry import config as cc -from cherry.config import ( +from cherry_etl import config as cc +from cherry_etl.config import ( Base58EncodeConfig, StepKind, ) -from cherry import run_pipelines, Context +from cherry_etl import run_pipelines, Context from typing import Dict from cherry_core import ingest import logging diff --git a/examples/uniswap_v2_swaps/main.py b/examples/uniswap_v2_swaps/main.py index d53f65a..311c83f 100644 --- a/examples/uniswap_v2_swaps/main.py +++ b/examples/uniswap_v2_swaps/main.py @@ -1,13 +1,13 @@ from clickhouse_connect.driver.asyncclient import AsyncClient import pyarrow as pa -from cherry import config as cc -from cherry.config import ( +from cherry_etl import config as cc +from cherry_etl.config import ( ClickHouseSkipIndex, StepKind, EvmDecodeEventsConfig, CastConfig, ) -from cherry import run_pipelines, Context +from cherry_etl import run_pipelines, Context from cherry_core import ingest import logging import os diff --git a/pyproject.toml b/pyproject.toml index 8d21567..91a2d99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cherry-etl" -version = "0.1.0" +version = "0.2.0" description = "Library for building blockchain pipelines" repository = "https://github.com/steelcake/cherry" homepage = "https://github.com/steelcake/cherry" @@ -34,6 +34,3 @@ dev = [ requires = ["hatchling"] build-backend = "hatchling.build" -[tool.hatch.build.targets.wheel] -packages = ["src/cherry"] - diff --git a/src/cherry/__init__.py b/src/cherry_etl/__init__.py similarity index 100% rename from src/cherry/__init__.py rename to src/cherry_etl/__init__.py diff --git a/src/cherry/config.py b/src/cherry_etl/config.py similarity index 100% rename from src/cherry/config.py rename to src/cherry_etl/config.py diff --git a/src/cherry/pipeline.py b/src/cherry_etl/pipeline.py similarity index 100% rename from src/cherry/pipeline.py rename to src/cherry_etl/pipeline.py diff --git a/src/cherry/steps/__init__.py b/src/cherry_etl/steps/__init__.py similarity index 100% rename from src/cherry/steps/__init__.py rename to src/cherry_etl/steps/__init__.py diff --git a/src/cherry/steps/base58_encode.py b/src/cherry_etl/steps/base58_encode.py similarity index 100% rename from src/cherry/steps/base58_encode.py rename to src/cherry_etl/steps/base58_encode.py diff --git a/src/cherry/steps/cast.py b/src/cherry_etl/steps/cast.py similarity index 100% rename from src/cherry/steps/cast.py rename to src/cherry_etl/steps/cast.py diff --git a/src/cherry/steps/cast_by_type.py b/src/cherry_etl/steps/cast_by_type.py similarity index 100% rename from src/cherry/steps/cast_by_type.py rename to src/cherry_etl/steps/cast_by_type.py diff --git a/src/cherry/steps/evm_decode_events.py b/src/cherry_etl/steps/evm_decode_events.py similarity index 100% rename from src/cherry/steps/evm_decode_events.py rename to src/cherry_etl/steps/evm_decode_events.py diff --git a/src/cherry/steps/evm_validate_block_data.py b/src/cherry_etl/steps/evm_validate_block_data.py similarity index 100% rename from src/cherry/steps/evm_validate_block_data.py rename to src/cherry_etl/steps/evm_validate_block_data.py diff --git a/src/cherry/steps/hex_encode.py b/src/cherry_etl/steps/hex_encode.py similarity index 100% rename from src/cherry/steps/hex_encode.py rename to src/cherry_etl/steps/hex_encode.py diff --git a/src/cherry/steps/util.py b/src/cherry_etl/steps/util.py similarity index 100% rename from src/cherry/steps/util.py rename to src/cherry_etl/steps/util.py diff --git a/src/cherry/writers/__init__.py b/src/cherry_etl/writers/__init__.py similarity index 100% rename from src/cherry/writers/__init__.py rename to src/cherry_etl/writers/__init__.py diff --git a/src/cherry/writers/base.py b/src/cherry_etl/writers/base.py similarity index 100% rename from src/cherry/writers/base.py rename to src/cherry_etl/writers/base.py diff --git a/src/cherry/writers/clickhouse.py b/src/cherry_etl/writers/clickhouse.py similarity index 100% rename from src/cherry/writers/clickhouse.py rename to src/cherry_etl/writers/clickhouse.py diff --git a/src/cherry/writers/delta_lake.py b/src/cherry_etl/writers/delta_lake.py similarity index 100% rename from src/cherry/writers/delta_lake.py rename to src/cherry_etl/writers/delta_lake.py diff --git a/src/cherry/writers/iceberg.py b/src/cherry_etl/writers/iceberg.py similarity index 100% rename from src/cherry/writers/iceberg.py rename to src/cherry_etl/writers/iceberg.py diff --git a/src/cherry/writers/pyarrow_dataset.py b/src/cherry_etl/writers/pyarrow_dataset.py similarity index 100% rename from src/cherry/writers/pyarrow_dataset.py rename to src/cherry_etl/writers/pyarrow_dataset.py diff --git a/src/cherry/writers/writer.py b/src/cherry_etl/writers/writer.py similarity index 100% rename from src/cherry/writers/writer.py rename to src/cherry_etl/writers/writer.py