From 1c130702144a9c43113c8285a9362ef3c94c55bd Mon Sep 17 00:00:00 2001 From: vitosotdihaet Date: Tue, 28 May 2024 23:09:20 +0300 Subject: [PATCH 1/7] Set up events library --- events/__init__.py | 7 +++++++ event.py => events/event.py | 0 kafka_event.py => events/kafka_event.py | 0 setup.py | 22 ++++++++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 events/__init__.py rename event.py => events/event.py (100%) rename kafka_event.py => events/kafka_event.py (100%) create mode 100644 setup.py diff --git a/events/__init__.py b/events/__init__.py new file mode 100644 index 0000000..e3aece6 --- /dev/null +++ b/events/__init__.py @@ -0,0 +1,7 @@ +from .event import Event +from .kafka_event import KafkaEventReader, KafkaEventWriter + +__all__ = [ + 'Event', + 'KafkaEventReader', 'KafkaEventWriter' +] \ No newline at end of file diff --git a/event.py b/events/event.py similarity index 100% rename from event.py rename to events/event.py diff --git a/kafka_event.py b/events/kafka_event.py similarity index 100% rename from kafka_event.py rename to events/kafka_event.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..2daad33 --- /dev/null +++ b/setup.py @@ -0,0 +1,22 @@ +from setuptools import setup, find_packages + +setup( + name='events', + version='0.1.0', + packages=find_packages(), + install_requires=[ + 'metrics @ git+https://github.com/BobryTeam/metrics.git@pip-deps', + 'trend_data @ git+https://github.com/BobryTeam/trend-data.git@pip-deps', + 'scale_data @ git+https://github.com/BobryTeam/scale-data@pip-deps', + 'kafka', + ], + author='BobryTeam', + author_email='sinntexxx@gmail.com', + description='ScaleData data structure', + url='https://github.com/BobryTeam/scale-data', + classifiers=[ + 'Programming Language :: Python :: 3', + 'Operating System :: OS Independent', + ], + python_requires='>=3.10', +) From 5835cc2678be75b9bc0ac60354eb89179de0aa57 Mon Sep 17 00:00:00 2001 From: vitosotdihaet Date: Tue, 28 May 2024 23:10:20 +0300 Subject: [PATCH 2/7] Add EventType --- events/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/events/__init__.py b/events/__init__.py index e3aece6..7535b65 100644 --- a/events/__init__.py +++ b/events/__init__.py @@ -1,7 +1,7 @@ -from .event import Event +from .event import Event, EventType from .kafka_event import KafkaEventReader, KafkaEventWriter __all__ = [ - 'Event', + 'Event', 'EventType', 'KafkaEventReader', 'KafkaEventWriter' ] \ No newline at end of file From 438004c3a51d8775ee273d00dc0887c8acad3839 Mon Sep 17 00:00:00 2001 From: vitosotdihaet Date: Tue, 28 May 2024 23:21:02 +0300 Subject: [PATCH 3/7] Try removing scale_data --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2daad33..3663cc8 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ install_requires=[ 'metrics @ git+https://github.com/BobryTeam/metrics.git@pip-deps', 'trend_data @ git+https://github.com/BobryTeam/trend-data.git@pip-deps', - 'scale_data @ git+https://github.com/BobryTeam/scale-data@pip-deps', + # 'scale_data @ git+https://github.com/BobryTeam/scale-data@pip-deps', 'kafka', ], author='BobryTeam', From 5d28d3a5342610eba851e58f7cca904d111b15f5 Mon Sep 17 00:00:00 2001 From: vitosotdihaet Date: Tue, 28 May 2024 23:26:59 +0300 Subject: [PATCH 4/7] Require kafka-python --- events/event.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/events/event.py b/events/event.py index f1a0cab..6d4d9c0 100644 --- a/events/event.py +++ b/events/event.py @@ -1,8 +1,8 @@ from enum import Enum +from metrics import * from trend_data import * from scale_data import * -from metrics import * class EventType(Enum): diff --git a/setup.py b/setup.py index 3663cc8..df32b6d 100644 --- a/setup.py +++ b/setup.py @@ -5,10 +5,10 @@ version='0.1.0', packages=find_packages(), install_requires=[ + 'kafka-python', 'metrics @ git+https://github.com/BobryTeam/metrics.git@pip-deps', 'trend_data @ git+https://github.com/BobryTeam/trend-data.git@pip-deps', - # 'scale_data @ git+https://github.com/BobryTeam/scale-data@pip-deps', - 'kafka', + 'scale_data @ git+https://github.com/BobryTeam/scale-data@pip-deps', ], author='BobryTeam', author_email='sinntexxx@gmail.com', From e8668ab0c94b047de3beabdeb99c4e7bf7bc6a84 Mon Sep 17 00:00:00 2001 From: vitosotdihaet Date: Tue, 28 May 2024 23:28:41 +0300 Subject: [PATCH 5/7] Fix imports --- events/kafka_event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events/kafka_event.py b/events/kafka_event.py index fe24f31..ad71ba9 100644 --- a/events/kafka_event.py +++ b/events/kafka_event.py @@ -5,7 +5,7 @@ from kafka import KafkaConsumer, KafkaProducer -from event import * +from .event import * MESSAGE_ENCODING = 'utf-8' From 5fa6004c45aea12547686030e7c62998eef99ed9 Mon Sep 17 00:00:00 2001 From: vitosotdihaet Date: Tue, 28 May 2024 23:33:03 +0300 Subject: [PATCH 6/7] Fix install_requires --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index df32b6d..f804fe9 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ 'kafka-python', 'metrics @ git+https://github.com/BobryTeam/metrics.git@pip-deps', 'trend_data @ git+https://github.com/BobryTeam/trend-data.git@pip-deps', - 'scale_data @ git+https://github.com/BobryTeam/scale-data@pip-deps', + 'scale_data @ git+https://github.com/BobryTeam/scale-data.git@pip-deps', ], author='BobryTeam', author_email='sinntexxx@gmail.com', From 2528f5968efb146d745fafd628689584ee43cc8e Mon Sep 17 00:00:00 2001 From: vitosotdihaet Date: Tue, 28 May 2024 23:37:53 +0300 Subject: [PATCH 7/7] Fix the description --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f804fe9..913e192 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ ], author='BobryTeam', author_email='sinntexxx@gmail.com', - description='ScaleData data structure', + description='Events and KafkaEvent* classes', url='https://github.com/BobryTeam/scale-data', classifiers=[ 'Programming Language :: Python :: 3',