FGFS-4.1/pyModeS
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release version 2.4 - fix import errors

Browse Source
This commit is contained in:
Junzi Sun 2019-09-24 21:26:35 +02:00
parent 3619d52760
commit 26173b4038
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pyModeS/streamer/modeslive
View File

@ -71,10 +71,7 @@ elif SOURCE == "net":
else: else:
SERVER, PORT, DATATYPE = args.connect SERVER, PORT, DATATYPE = args.connect
if DATATYPE not in support_rawtypes: if DATATYPE not in support_rawtypes:
print( print("Data type not supported, avaiable ones are %s" % support_rawtypes)
"Data type not supported, avaiable ones are %s"
% support_rawtypes
)
else: else:
print('Source must be "rtlsdr" or "net".') print('Source must be "rtlsdr" or "net".')
@ -105,9 +102,7 @@ elif SOURCE == "rtlsdr":
source = RtlSdrSource() source = RtlSdrSource()
recv_process = multiprocessing.Process( recv_process = multiprocessing.Process(target=source.run, args=(raw_pipe_in, stop_flag))
target=source.run, args=(raw_pipe_in, stop_flag)
)
decode = Decode(latlon=LATLON, dumpto=DUMPTO) decode = Decode(latlon=LATLON, dumpto=DUMPTO)
@ -116,9 +111,7 @@ decode_process = multiprocessing.Process(
) )
screen = Screen(uncertainty=UNCERTAINTY) screen = Screen(uncertainty=UNCERTAINTY)
screen_process = multiprocessing.Process( screen_process = multiprocessing.Process(target=screen.run, args=(ac_pipe_out,))
target=screen.run, args=(ac_pipe_out,)
)
def closeall(signal, frame): def closeall(signal, frame):

7
setup.py
View File

@ -6,7 +6,7 @@ https://github.com/pypa/sampleproject
Steps for deploying a new verison: Steps for deploying a new verison:
1. Increase the version number 1. Increase the version number
2. remove the old deployment under [dist] folder 2. remove the old deployment under [dist] and [build] folder
3. run: python setup.py sdist 3. run: python setup.py sdist
run: python setup.py bdist_wheel --universal run: python setup.py bdist_wheel --universal
4. twine upload dist/* 4. twine upload dist/*
@ -30,7 +30,7 @@ setup(
# Versions should comply with PEP440. For a discussion on single-sourcing # Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see # the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html # https://packaging.python.org/en/latest/single_source_version.html
version="2.3", version="2.4",
description="Python Mode-S and ADS-B Decoder", description="Python Mode-S and ADS-B Decoder",
long_description=long_description, long_description=long_description,
# The project's main homepage. # The project's main homepage.
@ -74,7 +74,7 @@ setup(
# your project is installed. For an analysis of "install_requires" vs pip's # your project is installed. For an analysis of "install_requires" vs pip's
# requirements files see: # requirements files see:
# https://packaging.python.org/en/latest/requirements.html # https://packaging.python.org/en/latest/requirements.html
install_requires=["numpy"], install_requires=["numpy", "argparse", "pyzmq", "pyrtlsdr"],
# List additional groups of dependencies here (e.g. development # List additional groups of dependencies here (e.g. development
# dependencies). You can install these using the following syntax, # dependencies). You can install these using the following syntax,
# for example: # for example:
@ -83,7 +83,6 @@ setup(
# 'dev': ['check-manifest'], # 'dev': ['check-manifest'],
# 'test': ['coverage'], # 'test': ['coverage'],
# }, # },
extras_require={"all": ["argparse", "pyzmq", "pyrtlsdr"]},
# If there are data files included in your packages that need to be # If there are data files included in your packages that need to be
# installed, specify them here. If using Python 2.6 or less, then these # installed, specify them here. If using Python 2.6 or less, then these
# have to be included in MANIFEST.in as well. # have to be included in MANIFEST.in as well.