mirror of
https://github.com/kk7ds/chirp.git
synced 2024-09-21 10:37:15 +00:00
Fix style issues in setup.py (#2355)
This patch brings setup.py into conformance with PEP8 rules and removes it from the blacklist. It also rewrites the staticify_chirp_module routine to be more idiomatic.
This commit is contained in:
parent
6c05d79ba2
commit
d6e1dc9880
47
setup.py
47
setup.py
@ -6,15 +6,16 @@ from chirp import CHIRP_VERSION
|
||||
from chirp import *
|
||||
import chirp
|
||||
|
||||
|
||||
def staticify_chirp_module():
|
||||
import chirp
|
||||
|
||||
init = file("chirp/__init__.py", "w")
|
||||
print >>init, "CHIRP_VERSION = \"%s\"" % CHIRP_VERSION
|
||||
print >>init, "__all__ = %s\n" % str(chirp.__all__)
|
||||
init.close()
|
||||
with file("chirp/__init__.py", "w") as init:
|
||||
print >>init, "CHIRP_VERSION = \"%s\"" % CHIRP_VERSION
|
||||
print >>init, "__all__ = %s\n" % str(chirp.__all__)
|
||||
|
||||
print "Set chirp/__init__.py::__all__ = %s" % str(chirp.__all__)
|
||||
|
||||
print "Set chirp.py::__all__ = %s" % str(chirp.__all__)
|
||||
|
||||
def win32_build():
|
||||
from distutils.core import setup
|
||||
@ -26,7 +27,7 @@ def win32_build():
|
||||
import win32com
|
||||
for p in win32com.__path__[1:]:
|
||||
modulefinder.AddPackagePath("win32com", p)
|
||||
for extra in ["win32com.shell"]: #,"win32com.mapi"
|
||||
for extra in ["win32com.shell"]: # ,"win32com.mapi"
|
||||
__import__(extra)
|
||||
m = sys.modules[extra]
|
||||
for p in m.__path__[1:]:
|
||||
@ -38,13 +39,15 @@ def win32_build():
|
||||
staticify_chirp_module()
|
||||
|
||||
opts = {
|
||||
"py2exe" : {
|
||||
"includes" : "pango,atk,gobject,cairo,pangocairo,win32gui,win32com,win32com.shell,email.iterators,email.generator,gio",
|
||||
"py2exe": {
|
||||
"includes": "pango,atk,gobject,cairo,pangocairo," +
|
||||
"win32gui,win32com,win32com.shell," +
|
||||
"email.iterators,email.generator,gio",
|
||||
|
||||
"compressed" : 1,
|
||||
"optimize" : 2,
|
||||
"bundle_files" : 3,
|
||||
# "packages" : ""
|
||||
"compressed": 1,
|
||||
"optimize": 2,
|
||||
"bundle_files": 3,
|
||||
# "packages": ""
|
||||
}
|
||||
}
|
||||
|
||||
@ -55,22 +58,22 @@ def win32_build():
|
||||
|
||||
setup(
|
||||
zipfile=None,
|
||||
windows=[{'script' : "chirpw",
|
||||
windows=[{'script': "chirpw",
|
||||
'icon_resources': [(0x0004, 'share/chirp.ico')],
|
||||
}],
|
||||
}],
|
||||
options=opts)
|
||||
|
||||
|
||||
def macos_build():
|
||||
from setuptools import setup
|
||||
import shutil
|
||||
|
||||
APP = ['chirp-%s.py' % CHIRP_VERSION]
|
||||
shutil.copy("chirpw", APP[0])
|
||||
DATA_FILES = [('../Frameworks',
|
||||
['/opt/local/lib/libpangox-1.0.dylib']),
|
||||
('../Resources/', ['/opt/local/lib/pango']),
|
||||
DATA_FILES = [('../Frameworks', ['/opt/local/lib/libpangox-1.0.dylib']),
|
||||
('../Resources/', ['/opt/local/lib/pango']),
|
||||
]
|
||||
OPTIONS = {'argv_emulation': True, "includes" : "gtk,atk,pangocairo,cairo"}
|
||||
OPTIONS = {'argv_emulation': True, "includes": "gtk,atk,pangocairo,cairo"}
|
||||
|
||||
setup(
|
||||
app=APP,
|
||||
@ -79,10 +82,12 @@ def macos_build():
|
||||
setup_requires=['py2app'],
|
||||
)
|
||||
|
||||
EXEC = 'bash ./build/macos/make_pango.sh /opt/local dist/chirp-%s.app' % CHIRP_VERSION
|
||||
EXEC = 'bash ./build/macos/make_pango.sh ' + \
|
||||
'/opt/local dist/chirp-%s.app' % CHIRP_VERSION
|
||||
#print "exec string: %s" % EXEC
|
||||
os.system(EXEC)
|
||||
|
||||
|
||||
def default_build():
|
||||
from distutils.core import setup
|
||||
from glob import glob
|
||||
@ -117,6 +122,7 @@ def default_build():
|
||||
('share/chirp/stock_configs', stock_configs),
|
||||
] + locale_files)
|
||||
|
||||
|
||||
def rpttool_build():
|
||||
from distutils.core import setup
|
||||
|
||||
@ -128,6 +134,7 @@ def rpttool_build():
|
||||
data_files=[('/usr/sbin', ["tools/icomsio.sh"])],
|
||||
)
|
||||
|
||||
|
||||
def nuke_manifest(*files):
|
||||
for i in ["MANIFEST", "MANIFEST.in"]:
|
||||
if os.path.exists(i):
|
||||
@ -141,6 +148,7 @@ def nuke_manifest(*files):
|
||||
print >>f, fn
|
||||
f.close()
|
||||
|
||||
|
||||
if sys.platform == "darwin":
|
||||
macos_build()
|
||||
elif sys.platform == "win32":
|
||||
@ -157,4 +165,3 @@ else:
|
||||
"include stock_configs/*",
|
||||
"include COPYING")
|
||||
default_build()
|
||||
|
||||
|
@ -92,7 +92,6 @@
|
||||
./chirpui/reporting.py
|
||||
./csvdump/csvapp.py
|
||||
./csvdump/csvdump.py
|
||||
./setup.py
|
||||
./share/make_supported.py
|
||||
./tests/run_tests
|
||||
./tests/unit/test_import_logic.py
|
||||
|
Loading…
Reference in New Issue
Block a user