install: removed "nox" option as there is no more X dependency since WIX has been deprecated

This commit is contained in:
Goffi 2016-02-10 12:48:19 +01:00
commit 0927253b7e

View file

@ -59,7 +59,6 @@ LAUNCH_DAEMON_COMMAND = 'sat'
ENV_SAT_INSTALL = "SAT_INSTALL" # environment variable to customise installation
NO_PREINSTALL_OPT = 'nopreinstall' # skip all preinstallation checks
AUTO_DEB_OPT = 'autodeb' # automaticaly install debs
NO_X_OPT = 'nox' # don't install X dependant packages
CLEAN_OPT = 'clean' # remove previous installation directories
PURGE_OPT = 'purge' # remove building and previous installation directories
DBUS_DIR = 'dbus-1/services'
@ -228,9 +227,6 @@ def preinstall_check(install_opt):
#modules_tocheck = ['twisted', 'twisted.words', 'twisted.web', 'urwid']
modules_tocheck = ['gobject'] # XXX: python-gobject is not up-to-date in PyPi
if NO_X_OPT not in install_opt:
# append to modules_tocheck the packages needed by graphical frontends
pass
package = {'twisted': 'python-twisted-core',
'twisted.words': 'python-twisted-words',
@ -310,4 +306,4 @@ setup(name=NAME,
dependency_links=['http://home.avvanta.com/%7Esteveha/pyfeed-0.7.4.tar.gz', 'http://home.avvanta.com/%7Esteveha/xe-0.7.4.tar.gz'],
install_requires=['twisted', 'wokkel >= 0.7.1', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.4.0', 'pyfeed', 'xe', 'mutagen', 'pillow', 'lxml >= 3.1.0', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr', 'PyOpenSSL'],
cmdclass={'install': CustomInstall},
) # XXX: wxpython doesn't work, it's managed with preinstall_check
)