From f18561d64b73f7f7579622df82833ad346c97e01 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Thu, 4 Aug 2016 17:40:20 +0100 Subject: [PATCH] rename to segment --- {analytics => segment}/__init__.py | 4 ++-- {analytics => segment}/client.py | 6 +++--- {analytics => segment}/consumer.py | 4 ++-- {analytics => segment}/request.py | 0 {analytics => segment}/test/__init__.py | 4 +++- {analytics => segment}/test/client.py | 4 ++-- {analytics => segment}/test/consumer.py | 2 +- {analytics => segment}/test/module.py | 4 ++-- {analytics => segment}/test/request.py | 2 +- {analytics => segment}/test/utils.py | 2 +- {analytics => segment}/utils.py | 0 {analytics => segment}/version.py | 0 setup.py | 6 +++--- 13 files changed, 20 insertions(+), 18 deletions(-) rename {analytics => segment}/__init__.py (94%) rename {analytics => segment}/client.py (98%) rename {analytics => segment}/consumer.py (97%) rename {analytics => segment}/request.py (100%) rename {analytics => segment}/test/__init__.py (85%) rename {analytics => segment}/test/client.py (99%) rename {analytics => segment}/test/consumer.py (96%) rename {analytics => segment}/test/module.py (94%) rename {analytics => segment}/test/request.py (92%) rename {analytics => segment}/test/utils.py (98%) rename {analytics => segment}/utils.py (100%) rename {analytics => segment}/version.py (100%) diff --git a/analytics/__init__.py b/segment/__init__.py similarity index 94% rename from analytics/__init__.py rename to segment/__init__.py index 433ab61e..d18d3eee 100644 --- a/analytics/__init__.py +++ b/segment/__init__.py @@ -1,6 +1,6 @@ -from analytics.version import VERSION -from analytics.client import Client +from .version import VERSION +from .client import Client __version__ = VERSION diff --git a/analytics/client.py b/segment/client.py similarity index 98% rename from analytics/client.py rename to segment/client.py index 640be5ae..baf1b5a6 100644 --- a/analytics/client.py +++ b/segment/client.py @@ -7,9 +7,9 @@ from dateutil.tz import tzutc from six import string_types -from analytics.utils import guess_timezone, clean -from analytics.consumer import Consumer -from analytics.version import VERSION +from .utils import guess_timezone, clean +from .consumer import Consumer +from .version import VERSION try: import queue diff --git a/analytics/consumer.py b/segment/consumer.py similarity index 97% rename from analytics/consumer.py rename to segment/consumer.py index f49993a1..287b71b7 100644 --- a/analytics/consumer.py +++ b/segment/consumer.py @@ -1,8 +1,8 @@ import logging from threading import Thread -from analytics.version import VERSION -from analytics.request import post +from .version import VERSION +from .request import post try: from queue import Empty diff --git a/analytics/request.py b/segment/request.py similarity index 100% rename from analytics/request.py rename to segment/request.py diff --git a/analytics/test/__init__.py b/segment/test/__init__.py similarity index 85% rename from analytics/test/__init__.py rename to segment/test/__init__.py index 877653af..ff506251 100644 --- a/analytics/test/__init__.py +++ b/segment/test/__init__.py @@ -3,9 +3,11 @@ import logging import sys + def all_names(): for _, modname, _ in pkgutil.iter_modules(__path__): - yield 'analytics.test.' + modname + yield __name__ + '.' + modname + def all(): logging.basicConfig(stream=sys.stderr) diff --git a/analytics/test/client.py b/segment/test/client.py similarity index 99% rename from analytics/test/client.py rename to segment/test/client.py index 5b56df7b..93823553 100644 --- a/analytics/test/client.py +++ b/segment/test/client.py @@ -3,8 +3,8 @@ import time import six -from analytics.version import VERSION -from analytics.client import Client +from ..version import VERSION +from ..client import Client class TestClient(unittest.TestCase): diff --git a/analytics/test/consumer.py b/segment/test/consumer.py similarity index 96% rename from analytics/test/consumer.py rename to segment/test/consumer.py index 782d1377..0333aacb 100644 --- a/analytics/test/consumer.py +++ b/segment/test/consumer.py @@ -5,7 +5,7 @@ except: from Queue import Queue -from analytics.consumer import Consumer +from ..consumer import Consumer class TestConsumer(unittest.TestCase): diff --git a/analytics/test/module.py b/segment/test/module.py similarity index 94% rename from analytics/test/module.py rename to segment/test/module.py index 503e9364..765ec531 100644 --- a/analytics/test/module.py +++ b/segment/test/module.py @@ -1,6 +1,6 @@ import unittest -import analytics +import segment as analytics class TestModule(unittest.TestCase): @@ -42,4 +42,4 @@ def test_screen(self): analytics.flush() def test_flush(self): - analytics.flush() \ No newline at end of file + analytics.flush() diff --git a/analytics/test/request.py b/segment/test/request.py similarity index 92% rename from analytics/test/request.py rename to segment/test/request.py index 5d1ce5ee..4d771afb 100644 --- a/analytics/test/request.py +++ b/segment/test/request.py @@ -2,7 +2,7 @@ import unittest import json -from analytics.request import post, DatetimeSerializer +from ..request import post, DatetimeSerializer class TestRequests(unittest.TestCase): diff --git a/analytics/test/utils.py b/segment/test/utils.py similarity index 98% rename from analytics/test/utils.py rename to segment/test/utils.py index 30eb0bad..5562bb08 100644 --- a/analytics/test/utils.py +++ b/segment/test/utils.py @@ -5,7 +5,7 @@ from dateutil.tz import tzutc import six -from analytics import utils +from .. import utils class TestUtils(unittest.TestCase): diff --git a/analytics/utils.py b/segment/utils.py similarity index 100% rename from analytics/utils.py rename to segment/utils.py diff --git a/analytics/version.py b/segment/version.py similarity index 100% rename from analytics/version.py rename to segment/version.py diff --git a/setup.py b/setup.py index d0cd5ec2..7560715b 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from distutils.core import setup # Don't import analytics-python module here, since deps may not be installed -sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'analytics')) +sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'segment')) from version import VERSION long_description = ''' @@ -35,8 +35,8 @@ author_email='friends@segment.com', maintainer='Segment', maintainer_email='friends@segment.com', - test_suite='analytics.test.all', - packages=['analytics', 'analytics.test'], + test_suite='segment.test.all', + packages=['segment'], license='MIT License', install_requires=install_requires, description='The hassle-free way to integrate analytics into any python application.',