From f40d6b490c8fca2ff49cbf40ce06aad7b7d23780 Mon Sep 17 00:00:00 2001 From: Alvin Chow Date: Tue, 17 Mar 2015 12:19:59 -0700 Subject: [PATCH] rename package from analytics to segment --- analytics/test/module.py | 45 ------------------------- {analytics => segment}/__init__.py | 6 ++-- {analytics => segment}/client.py | 6 ++-- {analytics => segment}/consumer.py | 4 +-- {analytics => segment}/request.py | 0 {analytics => segment}/test/__init__.py | 2 +- {analytics => segment}/test/client.py | 6 ++-- {analytics => segment}/test/consumer.py | 2 +- segment/test/module.py | 45 +++++++++++++++++++++++++ {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 ++-- 14 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 analytics/test/module.py rename {analytics => segment}/__init__.py (87%) 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 (98%) rename {analytics => segment}/test/consumer.py (96%) create mode 100644 segment/test/module.py rename {analytics => segment}/test/request.py (94%) rename {analytics => segment}/test/utils.py (97%) rename {analytics => segment}/utils.py (100%) rename {analytics => segment}/version.py (100%) diff --git a/analytics/test/module.py b/analytics/test/module.py deleted file mode 100644 index 503e9364..00000000 --- a/analytics/test/module.py +++ /dev/null @@ -1,45 +0,0 @@ -import unittest - -import analytics - - -class TestModule(unittest.TestCase): - - def failed(self): - self.failed = True - - def setUp(self): - self.failed = False - analytics.write_key = 'testsecret' - analytics.on_error = self.failed - - def test_no_write_key(self): - analytics.write_key = None - self.assertRaises(Exception, analytics.track) - - def test_track(self): - analytics.track('userId', 'python module event') - analytics.flush() - - def test_identify(self): - analytics.identify('userId', { 'email': 'user@email.com' }) - analytics.flush() - - def test_group(self): - analytics.group('userId', 'groupId') - analytics.flush() - - def test_alias(self): - analytics.alias('previousId', 'userId') - analytics.flush() - - def test_page(self): - analytics.page('userId') - analytics.flush() - - def test_screen(self): - analytics.screen('userId') - analytics.flush() - - def test_flush(self): - analytics.flush() \ No newline at end of file diff --git a/analytics/__init__.py b/segment/__init__.py similarity index 87% rename from analytics/__init__.py rename to segment/__init__.py index c16ef1c4..fe830f37 100644 --- a/analytics/__init__.py +++ b/segment/__init__.py @@ -1,6 +1,6 @@ -from analytics.version import VERSION -from analytics.client import Client +from segment.version import VERSION +from segment.client import Client __version__ = VERSION @@ -42,7 +42,7 @@ def flush(): _proxy('flush') def _proxy(method, *args, **kwargs): - """Create an analytics client if one doesn't exist and send to it.""" + """Create a segment client if one doesn't exist and send to it.""" global default_client if not default_client: default_client = Client(write_key, debug=debug, on_error=on_error, diff --git a/analytics/client.py b/segment/client.py similarity index 98% rename from analytics/client.py rename to segment/client.py index c6b4b7fe..b12d2e30 100644 --- a/analytics/client.py +++ b/segment/client.py @@ -6,9 +6,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 segment.utils import guess_timezone, clean +from segment.consumer import Consumer +from segment.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 ca1761f4..f805b3f9 100644 --- a/analytics/consumer.py +++ b/segment/consumer.py @@ -1,8 +1,8 @@ from threading import Thread import logging -from analytics.version import VERSION -from analytics.request import post +from segment.version import VERSION +from segment.request import post class Consumer(Thread): 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..9e45ace9 100644 --- a/analytics/test/__init__.py +++ b/segment/test/__init__.py @@ -5,7 +5,7 @@ def all_names(): for _, modname, _ in pkgutil.iter_modules(__path__): - yield 'analytics.test.' + modname + yield 'segment.test.' + modname def all(): logging.basicConfig(stream=sys.stderr) diff --git a/analytics/test/client.py b/segment/test/client.py similarity index 98% rename from analytics/test/client.py rename to segment/test/client.py index c3cc6c36..c2930c08 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 segment.version import VERSION +from segment.client import Client class TestClient(unittest.TestCase): @@ -242,4 +242,4 @@ def test_numeric_user_id(self): self.assertFalse(self.failed) def test_debug(self): - Client('bad_key', debug=True) \ No newline at end of file + Client('bad_key', debug=True) 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..d429a506 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 segment.consumer import Consumer class TestConsumer(unittest.TestCase): diff --git a/segment/test/module.py b/segment/test/module.py new file mode 100644 index 00000000..d975079a --- /dev/null +++ b/segment/test/module.py @@ -0,0 +1,45 @@ +import unittest + +import segment + + +class TestModule(unittest.TestCase): + + def failed(self): + self.failed = True + + def setUp(self): + self.failed = False + segment.write_key = 'testsecret' + segment.on_error = self.failed + + def test_no_write_key(self): + segment.write_key = None + self.assertRaises(Exception, segment.track) + + def test_track(self): + segment.track('userId', 'python module event') + segment.flush() + + def test_identify(self): + segment.identify('userId', { 'email': 'user@email.com' }) + segment.flush() + + def test_group(self): + segment.group('userId', 'groupId') + segment.flush() + + def test_alias(self): + segment.alias('previousId', 'userId') + segment.flush() + + def test_page(self): + segment.page('userId') + segment.flush() + + def test_screen(self): + segment.screen('userId') + segment.flush() + + def test_flush(self): + segment.flush() diff --git a/analytics/test/request.py b/segment/test/request.py similarity index 94% rename from analytics/test/request.py rename to segment/test/request.py index 11c8eec2..c8cdf350 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 segment.request import post, DatetimeSerializer class TestRequests(unittest.TestCase): diff --git a/analytics/test/utils.py b/segment/test/utils.py similarity index 97% rename from analytics/test/utils.py rename to segment/test/utils.py index 8be40a4a..700f7b9e 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 segment 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 d8840ba7..3cd8dacc 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 = ''' @@ -29,8 +29,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', 'segment.test'], license='MIT License', install_requires=[ 'python-dateutil',