From 0b3ffc452e05a362851dbf5b8ca79b232342dfd1 Mon Sep 17 00:00:00 2001 From: daid Date: Fri, 24 Apr 2015 17:07:32 +0200 Subject: [PATCH] Some style fixing, and added a test script to test for the major style violations. --- setup.py | 58 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/setup.py b/setup.py index 60a2744cdd..dee7e5bbcc 100644 --- a/setup.py +++ b/setup.py @@ -10,32 +10,32 @@ import site includes = ['sip', 'ctypes', 'UM', 'PyQt5.QtNetwork', 'PyQt5._QOpenGLFunctions_2_0', 'serial', 'Arcus', 'google', 'google.protobuf', 'google.protobuf.descriptor', 'xml.etree', 'xml.etree.ElementTree'] # Include all the UM modules in the includes. As py2exe fails to properly find all the dependencies due to the plugin architecture. for dirpath, dirnames, filenames in os.walk('../UM'): - if '__' in dirpath: - continue - dirpath = dirpath.split(os.path.sep) - dirpath[0] = 'UM' - module_name = '.'.join(dirpath) - if os.path.isfile('../' + os.path.sep.join(dirpath) + '/__init__.py'): - includes += [module_name] - for filename in filenames: - if '__' in filename or not filename.endswith('.py'): - continue - includes += [module_name + '.' + os.path.splitext(filename)[0]] + if '__' in dirpath: + continue + dirpath = dirpath.split(os.path.sep) + dirpath[0] = 'UM' + module_name = '.'.join(dirpath) + if os.path.isfile('../' + os.path.sep.join(dirpath) + '/__init__.py'): + includes += [module_name] + for filename in filenames: + if '__' in filename or not filename.endswith('.py'): + continue + includes += [module_name + '.' + os.path.splitext(filename)[0]] print('Removing previous distribution package') shutil.rmtree('dist', True) setup(name="Cura", - version="2.0", - author="Ultimaker", - author_email="d.braam@ultimaker.com", - url="http://software.ultimaker.com/", - license="GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)", - scripts=["printer.py", "PrinterApplication.py"], - #windows=[{"script": "printer.py", "dest_name": "Cura"}], - console=[{"script": "printer.py"}], - options={"py2exe": {"skip_archive": False, "includes": includes}}) + version="2.0", + author="Ultimaker", + author_email="d.braam@ultimaker.com", + url="http://software.ultimaker.com/", + license="GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)", + scripts=["printer.py", "PrinterApplication.py"], + #windows=[{"script": "printer.py", "dest_name": "Cura"}], + console=[{"script": "printer.py"}], + options={"py2exe": {"skip_archive": False, "includes": includes}}) print('Coping Cura plugins.') shutil.copytree('../plugins', 'dist/plugins') @@ -46,13 +46,13 @@ shutil.copytree('../resources', 'dist/resources') print('Coping resources.') shutil.copytree('../UM/Qt/qml/UM', 'dist/qml/UM') for site_package in site.getsitepackages(): - qt_origin_path = os.path.join(site_package, 'PyQt5') - if os.path.isdir(qt_origin_path): - print('Coping PyQt5 plugins from: %s' % qt_origin_path) - shutil.copytree(os.path.join(qt_origin_path, 'plugins'), 'dist/PyQt5/plugins') - print('Coping PyQt5 QtQuick from: %s' % qt_origin_path) - shutil.copytree(os.path.join(qt_origin_path, 'qml/QtQuick'), 'dist/qml/QtQuick') - shutil.copytree(os.path.join(qt_origin_path, 'qml/QtQuick.2'), 'dist/qml/QtQuick.2') - print('Coping PyQt5 svg library from: %s' % qt_origin_path) - shutil.copy(os.path.join(qt_origin_path, 'Qt5Svg.dll'), 'dist/Qt5Svg.dll') + qt_origin_path = os.path.join(site_package, 'PyQt5') + if os.path.isdir(qt_origin_path): + print('Coping PyQt5 plugins from: %s' % qt_origin_path) + shutil.copytree(os.path.join(qt_origin_path, 'plugins'), 'dist/PyQt5/plugins') + print('Coping PyQt5 QtQuick from: %s' % qt_origin_path) + shutil.copytree(os.path.join(qt_origin_path, 'qml/QtQuick'), 'dist/qml/QtQuick') + shutil.copytree(os.path.join(qt_origin_path, 'qml/QtQuick.2'), 'dist/qml/QtQuick.2') + print('Coping PyQt5 svg library from: %s' % qt_origin_path) + shutil.copy(os.path.join(qt_origin_path, 'Qt5Svg.dll'), 'dist/Qt5Svg.dll') os.rename('dist/printer.exe', 'dist/Cura.exe')