From 95db87f00436dccf2e651df197061a36ed050c6b Mon Sep 17 00:00:00 2001 From: Prateek Sachan Date: Fri, 28 Jul 2023 17:42:42 +0530 Subject: [PATCH 1/2] changing dir structure and adding versioning --- pyproject.toml | 10 +--------- tracereq/__init__.py | 6 ------ tracereq_sdk/__init__.py | 8 ++++++++ {tracereq => tracereq_sdk}/api.py | 5 +++-- {tracereq => tracereq_sdk}/client.py | 0 {tracereq => tracereq_sdk}/constants.py | 0 {tracereq => tracereq_sdk}/customlib.py | 0 {tracereq => tracereq_sdk}/engine.py | 0 {tracereq => tracereq_sdk}/integrations/__init__.py | 2 +- {tracereq => tracereq_sdk}/integrations/flasklib.py | 4 ++-- {tracereq => tracereq_sdk}/tracing.py | 0 {tracereq => tracereq_sdk}/transport.py | 0 12 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 tracereq/__init__.py create mode 100644 tracereq_sdk/__init__.py rename {tracereq => tracereq_sdk}/api.py (77%) rename {tracereq => tracereq_sdk}/client.py (100%) rename {tracereq => tracereq_sdk}/constants.py (100%) rename {tracereq => tracereq_sdk}/customlib.py (100%) rename {tracereq => tracereq_sdk}/engine.py (100%) rename {tracereq => tracereq_sdk}/integrations/__init__.py (95%) rename {tracereq => tracereq_sdk}/integrations/flasklib.py (88%) rename {tracereq => tracereq_sdk}/tracing.py (100%) rename {tracereq => tracereq_sdk}/transport.py (100%) diff --git a/pyproject.toml b/pyproject.toml index 7cb18ec..ef68449 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,12 +44,4 @@ push = false "pyproject.toml" = [ 'current_version = "{version}"', ] -"setup.py" = [ - "{version}", - "{pep440_version}", -] -"README.md" = [ - "{version}", - "{pep440_version}", -] - +"tracereq_sdk/__init__.py" = ["{version}"] diff --git a/tracereq/__init__.py b/tracereq/__init__.py deleted file mode 100644 index 6aeb3ae..0000000 --- a/tracereq/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from tracereq.api import * - - -__all__ = [ - "init" -] diff --git a/tracereq_sdk/__init__.py b/tracereq_sdk/__init__.py new file mode 100644 index 0000000..60bdce2 --- /dev/null +++ b/tracereq_sdk/__init__.py @@ -0,0 +1,8 @@ +from tracereq_sdk.api import * + + +__all__ = [ + "init" +] + +__version__ = "1.0.0" diff --git a/tracereq/api.py b/tracereq_sdk/api.py similarity index 77% rename from tracereq/api.py rename to tracereq_sdk/api.py index 6a37fa8..890fc32 100644 --- a/tracereq/api.py +++ b/tracereq_sdk/api.py @@ -11,7 +11,8 @@ def public(f): @public -def init(token, *args, **kwargs): - client = Client(token, *args, **kwargs) +def init(api_key, *args, **kwargs): + client = Client(api_key, *args, **kwargs) Engine.main.attach_client(client) setup_integrations(*args, **kwargs) + diff --git a/tracereq/client.py b/tracereq_sdk/client.py similarity index 100% rename from tracereq/client.py rename to tracereq_sdk/client.py diff --git a/tracereq/constants.py b/tracereq_sdk/constants.py similarity index 100% rename from tracereq/constants.py rename to tracereq_sdk/constants.py diff --git a/tracereq/customlib.py b/tracereq_sdk/customlib.py similarity index 100% rename from tracereq/customlib.py rename to tracereq_sdk/customlib.py diff --git a/tracereq/engine.py b/tracereq_sdk/engine.py similarity index 100% rename from tracereq/engine.py rename to tracereq_sdk/engine.py diff --git a/tracereq/integrations/__init__.py b/tracereq_sdk/integrations/__init__.py similarity index 95% rename from tracereq/integrations/__init__.py rename to tracereq_sdk/integrations/__init__.py index 2e2e29e..875ee4e 100644 --- a/tracereq/integrations/__init__.py +++ b/tracereq_sdk/integrations/__init__.py @@ -5,7 +5,7 @@ def get_core_integrations(): - from tracereq.customlib import CustomlibIntegration + from tracereq_sdk.customlib import CustomlibIntegration yield CustomlibIntegration() diff --git a/tracereq/integrations/flasklib.py b/tracereq_sdk/integrations/flasklib.py similarity index 88% rename from tracereq/integrations/flasklib.py rename to tracereq_sdk/integrations/flasklib.py index b3e8f16..39b704f 100644 --- a/tracereq/integrations/flasklib.py +++ b/tracereq_sdk/integrations/flasklib.py @@ -1,8 +1,8 @@ from flask import Flask, _request_ctx_stack from flask.signals import request_started, request_finished from . import Integration -from tracereq.engine import Engine -from tracereq.tracing import generate_trace_event, Trace, generalize_request +from tracereq_sdk.engine import Engine +from tracereq_sdk.tracing import generate_trace_event, Trace, generalize_request class FlasklibIntegration(Integration): diff --git a/tracereq/tracing.py b/tracereq_sdk/tracing.py similarity index 100% rename from tracereq/tracing.py rename to tracereq_sdk/tracing.py diff --git a/tracereq/transport.py b/tracereq_sdk/transport.py similarity index 100% rename from tracereq/transport.py rename to tracereq_sdk/transport.py From 61d7606150548b8edf4658c50c625f185adf1a8b Mon Sep 17 00:00:00 2001 From: Prateek Sachan Date: Fri, 28 Jul 2023 17:42:52 +0530 Subject: [PATCH 2/2] bump version 1.0.0 -> 1.0.1 --- pyproject.toml | 2 +- tracereq_sdk/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ef68449..45516d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ dev = ["pip-tools"] Homepage = "https://github.com/tracereq/python-tracereq-sdk" [tool.bumpver] -current_version = "1.0.0" +current_version = "1.0.1" version_pattern = "MAJOR.MINOR.PATCH" commit_message = "bump version {old_version} -> {new_version}" tag_message = "{new_version}" diff --git a/tracereq_sdk/__init__.py b/tracereq_sdk/__init__.py index 60bdce2..e956994 100644 --- a/tracereq_sdk/__init__.py +++ b/tracereq_sdk/__init__.py @@ -5,4 +5,4 @@ "init" ] -__version__ = "1.0.0" +__version__ = "1.0.1"