Skip to content

Commit 1d5fb11

Browse files
committed
Add amodem.tests to source distribution
Also, fix a few pylint issues.
1 parent a8e8bbb commit 1d5fb11

16 files changed

+51
-56
lines changed

.pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[MESSAGES CONTROL]
2-
disable=invalid-name, missing-docstring, too-many-instance-attributes, too-few-public-methods, logging-format-interpolation, consider-using-with
2+
disable=invalid-name, missing-docstring, too-many-instance-attributes, too-few-public-methods, logging-format-interpolation, consider-using-with, redefined-outer-name

amodem/tests/__init__.py

Whitespace-only changes.

amodem/tests/test_alsa.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from amodem import alsa, config
2-
31
import mock
42

3+
from .. import alsa, config
4+
55

66
def test_alsa():
77
interface = alsa.Interface(config=config.fastest())

amodem/tests/test_async_reader.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
import mock
1+
import logging
22
import time
3+
4+
import mock
35
import pytest
4-
from amodem import async_reader
5-
import logging
6+
7+
from .. import async_reader
8+
69

710
logging.basicConfig(format='%(message)s')
811

amodem/tests/test_audio.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from amodem import audio, config
2-
31
import mock
42
import pytest
53

4+
from .. import audio, config
5+
66

77
def test():
88
length = 1024
@@ -31,4 +31,4 @@ def test():
3131
s.close()
3232

3333
with pytest.raises(Exception):
34-
interface._error_check(1)
34+
interface._error_check(1) # pylint: disable=protected-access

amodem/tests/test_calib.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
from amodem import calib
2-
from amodem import common
3-
from amodem import config
4-
51
from io import BytesIO
2+
import random
63

4+
import mock
75
import numpy as np
8-
import random
96
import pytest
10-
import mock
7+
8+
from .. import calib, common, config
9+
1110

1211
config = config.fastest()
1312

amodem/tests/test_common.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from amodem import common
2-
from amodem import config
31
import numpy as np
42

3+
from .. import common, config
4+
55

66
def iterlist(x, *args, **kwargs):
77
x = np.array(x)

amodem/tests/test_configs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from amodem import config
1+
from .. import config
22

33

44
def test_bitrates():

amodem/tests/test_detect.py

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
import numpy as np
22
import pytest
33

4-
from amodem import dsp
5-
from amodem import recv
6-
from amodem import detect
7-
from amodem import equalizer
8-
from amodem import sampling
9-
from amodem import config
10-
from amodem import common
4+
from .. import common, config, detect, dsp, equalizer, recv, sampling
5+
116
config = config.fastest()
127

138

@@ -17,7 +12,7 @@ def test_detect():
1712
x = np.cos(2 * np.pi * config.Fc * t)
1813

1914
detector = detect.Detector(config, pylab=common.Dummy())
20-
samples, amp, freq_err = detector.run(x)
15+
_samples, amp, freq_err = detector.run(x)
2116
assert abs(1 - amp) < 1e-12
2217
assert abs(freq_err) < 1e-12
2318

@@ -39,11 +34,11 @@ def symbols_stream(signal):
3934
sampler = sampling.Sampler(signal)
4035
return dsp.Demux(sampler=sampler, omegas=[omega], Nsym=config.Nsym)
4136
r = recv.Receiver(config, pylab=common.Dummy())
42-
r._prefix(symbols_stream(signal))
37+
r._prefix(symbols_stream(signal)) # pylint: disable=protected-access
4338

4439
with pytest.raises(ValueError):
4540
silence = 0 * signal
46-
r._prefix(symbols_stream(silence))
41+
r._prefix(symbols_stream(silence)) # pylint: disable=protected-access
4742

4843

4944
def test_find_start():

amodem/tests/test_dsp.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
from amodem import dsp
2-
from amodem import sampling
3-
from amodem import config
4-
import utils
5-
6-
import numpy as np
71
import random
82
import itertools
93

4+
import numpy as np
5+
6+
from .. import dsp, sampling, config
7+
from . import utils
8+
109
config = config.fastest()
1110

1211

@@ -69,7 +68,7 @@ def quantize(q, s):
6968
def test_overflow():
7069
q = dsp.MODEM(config.symbols)
7170
r = np.random.RandomState(seed=0)
72-
for i in range(10000):
71+
for _ in range(10000):
7372
s = 10*(r.normal() + 1j * r.normal())
7473
quantize(q, s)
7574

amodem/tests/test_equalizer.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from numpy.random import RandomState
22
import numpy as np
33

4-
import utils
5-
from amodem import equalizer
6-
from amodem import dsp
7-
from amodem import config
4+
from . import utils
5+
from .. import config, dsp, equalizer
6+
87
config = config.fastest()
98

109

amodem/tests/test_framing.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
from amodem import framing
2-
import random
31
import itertools
2+
import random
43

54
import pytest
65

6+
from .. import framing
7+
78

89
def concat(iterable):
910
return bytearray(itertools.chain.from_iterable(iterable))

amodem/tests/test_sampling.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from amodem import sampling
2-
from amodem import common
1+
from io import BytesIO
32

43
import numpy as np
5-
from io import BytesIO
4+
5+
from .. import common, sampling
66

77

88
def test_resample():

amodem/tests/test_stream.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
from amodem import stream
21
import subprocess as sp
32
import sys
43

4+
from .. import stream
5+
56
script = br"""
67
import sys
78
import time

amodem/tests/test_transfer.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
from amodem import main
2-
from amodem import common
3-
from amodem import sampling
4-
from amodem import config
5-
import utils
6-
7-
import numpy as np
8-
import os
91
from io import BytesIO
2+
import logging
3+
import os
104

5+
import numpy as np
116
import pytest
12-
import logging
7+
8+
from .. import common, config, main, sampling
9+
from . import utils
10+
1311
logging.basicConfig(level=logging.DEBUG, # useful for debugging
1412
format='%(asctime)s %(levelname)-12s %(message)s')
1513

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
from setuptools import setup
2+
from setuptools import setup, find_packages
33
from setuptools.command.test import test as TestCommand
44

55
class PyTest(TestCommand):
@@ -21,7 +21,7 @@ def run_tests(self):
2121
author_email='[email protected]',
2222
license='MIT',
2323
url='http://github.com/romanz/amodem',
24-
packages=['amodem'],
24+
packages=find_packages(),
2525
tests_require=['pytest'],
2626
cmdclass={'test': PyTest},
2727
install_requires=['numpy'],

0 commit comments

Comments
 (0)