From f5d97fab8013b8f4e67d7961ac49db598297b2dd Mon Sep 17 00:00:00 2001 From: "Michal Krenek (Mikos)" Date: Sun, 26 Apr 2015 22:16:21 +0200 Subject: [PATCH] Switch from distutils to setuptools --- MANIFEST.in | 3 ++ PKGBUILD | 1 + scripts/qspectrumanalyzer | 4 --- setup.py | 73 ++++++++++++++++++++++++--------------- 4 files changed, 49 insertions(+), 32 deletions(-) delete mode 100755 scripts/qspectrumanalyzer diff --git a/MANIFEST.in b/MANIFEST.in index 9d5d250..db446d0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,5 @@ include LICENSE include README.rst +include qspectrumanalyzer.desktop +include qspectrumanalyzer.png +include qspectrumanalyzer.svg diff --git a/PKGBUILD b/PKGBUILD index b259bb0..635c257 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,6 +7,7 @@ arch=('any') url="https://github.com/xmikos/qspectrumanalyzer" license=('GPL3') depends=('python-pyqt4' 'python-pyqtgraph' 'rtl-sdr') +makedepends=('python-setuptools') source=(https://github.com/xmikos/qspectrumanalyzer/archive/v$pkgver.tar.gz) build() { diff --git a/scripts/qspectrumanalyzer b/scripts/qspectrumanalyzer deleted file mode 100755 index c0f38fb..0000000 --- a/scripts/qspectrumanalyzer +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python - -from qspectrumanalyzer import __main__ -__main__.main() diff --git a/setup.py b/setup.py index 5c15c82..3fb0638 100755 --- a/setup.py +++ b/setup.py @@ -1,32 +1,49 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup from qspectrumanalyzer.version import __version__ -setup(name="QSpectrumAnalyzer", - version=__version__, - description="Spectrum analyzer for RTL-SDR (GUI for rtl_power based on PyQtGraph)", - author="Michal Krenek (Mikos)", - author_email="m.krenek@gmail.com", - url="https://github.com/xmikos/qspectrumanalyzer", - license="GNU GPLv3", - packages=["qspectrumanalyzer"], - data_files=[("share/applications", ["qspectrumanalyzer.desktop"]), - ("share/pixmaps", ["qspectrumanalyzer.png"])], - scripts=["scripts/qspectrumanalyzer"], - requires=["PyQt4", "pyqtgraph"], - classifiers=[ - 'Development Status :: 4 - Beta', - 'Environment :: MacOS X', - 'Environment :: Win32 (MS Windows)', - 'Environment :: X11 Applications :: Qt', - 'Intended Audience :: End Users/Desktop', - 'Intended Audience :: Science/Research', - 'Intended Audience :: Telecommunications Industry', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', - 'Natural Language :: English', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3', - 'Topic :: Communications :: Ham Radio', - 'Topic :: Scientific/Engineering :: Visualization' - ]) +setup( + name="QSpectrumAnalyzer", + version=__version__, + description="Spectrum analyzer for RTL-SDR (GUI for rtl_power based on PyQtGraph)", + author="Michal Krenek (Mikos)", + author_email="m.krenek@gmail.com", + url="https://github.com/xmikos/qspectrumanalyzer", + license="GNU GPLv3", + packages=["qspectrumanalyzer"], + package_data={ + "qspectrumanalyzer": [ + "*.ui", + "languages/*.qm", + "languages/*.ts" + ] + }, + data_files=[ + ("share/applications", ["qspectrumanalyzer.desktop"]), + ("share/pixmaps", ["qspectrumanalyzer.png"]) + ], + entry_points={ + "gui_scripts": [ + "qspectrumanalyzer=qspectrumanalyzer.__main__:main" + ], + }, + install_requires=[ + "pyqtgraph" + ], + classifiers=[ + "Development Status :: 4 - Beta", + "Environment :: MacOS X", + "Environment :: Win32 (MS Windows)", + "Environment :: X11 Applications :: Qt", + "Intended Audience :: End Users/Desktop", + "Intended Audience :: Science/Research", + "Intended Audience :: Telecommunications Industry", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Natural Language :: English", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3", + "Topic :: Communications :: Ham Radio", + "Topic :: Scientific/Engineering :: Visualization" + ] +)