update tests now that we have top-level imports (#80)

Author: copperlight

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = netflix-spectator-py
-version = 1.0.2
+version = 1.0.3
 description = Library for reporting metrics from Python applications to SpectatorD and the Netflix Atlas Timeseries Database.
 long_description = file: README.md
 long_description_content_type = text/markdown

spectator/__init__.py

@@ -1,7 +1,9 @@
 from spectator.config import Config
 from spectator.registry import Registry
 
-from spectator.protocol_parser import parse_protocol_line
+from spectator.clock import Clock, SystemClock, ManualClock
+from spectator.protocol_parser import get_meter_class, parse_protocol_line
+from spectator.stopwatch import StopWatch
 
 from spectator.meter import Meter
 from spectator.meter.meter_id import MeterId

tests/meter/test_age_gauge.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.age_gauge import AgeGauge
-from spectator.meter.meter_id import MeterId
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import AgeGauge, MemoryWriter, MeterId
 
 
 class AgeGaugeTest(unittest.TestCase):

tests/meter/test_counter.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.counter import Counter
-from spectator.meter.meter_id import MeterId
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import Counter, MemoryWriter, MeterId
 
 
 class CounterTest(unittest.TestCase):

tests/meter/test_dist_summary.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.dist_summary import DistributionSummary
-from spectator.meter.meter_id import MeterId
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import DistributionSummary, MemoryWriter, MeterId
 
 
 class DistributionSummaryTest(unittest.TestCase):

tests/meter/test_gauge.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.gauge import Gauge
-from spectator.meter.meter_id import MeterId
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import Gauge, MemoryWriter, MeterId
 
 
 class GaugeTest(unittest.TestCase):

tests/meter/test_max_gauge.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.max_gauge import MaxGauge
-from spectator.meter.meter_id import MeterId
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import MaxGauge, MemoryWriter, MeterId
 
 
 class MaxGaugeTest(unittest.TestCase):

tests/meter/test_meter_id.py

@@ -1,6 +1,6 @@
 import unittest
 
-from spectator.meter.meter_id import MeterId
+from spectator import MeterId
 
 
 class MeterIdTest(unittest.TestCase):

tests/meter/test_monotonic_counter.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.monotonic_counter import MonotonicCounter
-from spectator.meter.meter_id import MeterId
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import MonotonicCounter, MemoryWriter, MeterId
 
 
 class MonotonicCounterTest(unittest.TestCase):

tests/meter/test_monotonic_counter_uint.py

@@ -1,9 +1,7 @@
 import ctypes
 import unittest
 
-from spectator.meter.monotonic_counter_uint import MonotonicCounterUint
-from spectator.meter.meter_id import MeterId
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import MonotonicCounterUint, MemoryWriter, MeterId
 
 
 class MonotonicCounterUintTest(unittest.TestCase):

tests/meter/test_percentile_dist_summary.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.percentile_dist_summary import PercentileDistributionSummary
-from spectator.meter.meter_id import MeterId
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import MemoryWriter, MeterId, PercentileDistributionSummary
 
 
 class PercentileDistributionSummaryTest(unittest.TestCase):

tests/meter/test_percentile_timer.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.meter_id import MeterId
-from spectator.meter.percentile_timer import PercentileTimer
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import MemoryWriter, MeterId, PercentileTimer
 
 
 class PercentileTimerTest(unittest.TestCase):

tests/meter/test_timer.py

@@ -1,8 +1,6 @@
 import unittest
 
-from spectator.meter.meter_id import MeterId
-from spectator.meter.timer import Timer
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import MemoryWriter, MeterId, Timer
 
 
 class TimerTest(unittest.TestCase):

tests/test_clock.py

@@ -1,7 +1,7 @@
 import time
 import unittest
 
-from spectator.clock import Clock, SystemClock, ManualClock
+from spectator import Clock, SystemClock, ManualClock
 
 
 class ClockTest(unittest.TestCase):

tests/test_config.py

@@ -2,7 +2,7 @@
 import unittest
 from typing import Dict, Optional
 
-from spectator.config import Config
+from spectator import Config
 
 
 class ConfigTest(unittest.TestCase):

tests/test_protocol_parser.py

@@ -1,9 +1,6 @@
 import unittest
 
-from spectator.meter.counter import Counter
-from spectator.meter.gauge import Gauge
-from spectator.meter.timer import Timer
-from spectator.protocol_parser import get_meter_class, parse_protocol_line
+from spectator import Counter, Gauge, Timer, get_meter_class, parse_protocol_line
 
 
 class ProtocolParserTest(unittest.TestCase):

tests/test_registry.py

@@ -2,9 +2,7 @@
 import logging
 import unittest
 
-from spectator.config import Config
-from spectator.registry import Registry
-from spectator.writer.memory_writer import MemoryWriter
+from spectator import Config, MemoryWriter, Registry
 
 
 class RegistryTest(unittest.TestCase):

tests/test_stopwatch.py

@@ -1,9 +1,6 @@
 import unittest
 
-from spectator.config import Config
-from spectator.registry import Registry
-from spectator.clock import ManualClock
-from spectator.stopwatch import StopWatch
+from spectator import Config, ManualClock, Registry, StopWatch
 
 
 class StopwatchTest(unittest.TestCase):

tests/writer/test_file_writer.py

@@ -4,7 +4,7 @@
 from contextlib import closing, redirect_stderr, redirect_stdout
 from tempfile import TemporaryDirectory
 
-from spectator.writer.new_writer import new_writer
+from spectator import new_writer
 
 
 class FileWriterTest(unittest.TestCase):

tests/writer/test_memory_writer.py

@@ -1,6 +1,6 @@
 import unittest
 
-from spectator.writer.new_writer import new_writer
+from spectator import new_writer
 
 
 class MemoryWriterTest(unittest.TestCase):

tests/writer/test_noop_writer.py

@@ -1,6 +1,6 @@
 import unittest
 
-from spectator.writer.new_writer import new_writer
+from spectator import new_writer
 
 
 class NoopWriterTest(unittest.TestCase):

tests/writer/test_udp_writer.py

@@ -2,7 +2,7 @@
 import unittest
 from contextlib import closing
 
-from spectator.writer.new_writer import new_writer
+from spectator import new_writer
 from ..udp_server import UdpServer