From eecd1a40caf669900f4633b84181d0ab307cab9e Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Wed, 7 Jul 2010 19:50:52 +0200 Subject: [PATCH] add webkit dependency --- tools/all_packages.sh | 3 ++ .../setup.py.d/{qweboobcfg.py => core-qt.py} | 21 +++++--- tools/setup.py.d/core-webkit-formatter.py | 53 +++++++++++++++++++ tools/setup.py.d/core.py | 9 +++- weboob/tools/__init__.py | 1 + weboob/tools/application/__init__.py | 27 +--------- weboob/tools/application/console.py | 2 +- .../tools/application/formatters/__init__.py | 45 +--------------- .../tools/application/formatters/instances.py | 44 +++++++++++++++ .../application/formatters/webkit/__init__.py | 19 +++++++ .../formatters/{ => webkit}/webkitgtk.py | 0 11 files changed, 143 insertions(+), 81 deletions(-) rename tools/setup.py.d/{qweboobcfg.py => core-qt.py} (73%) create mode 100755 tools/setup.py.d/core-webkit-formatter.py create mode 100644 weboob/tools/application/formatters/instances.py create mode 100644 weboob/tools/application/formatters/webkit/__init__.py rename weboob/tools/application/formatters/{ => webkit}/webkitgtk.py (100%) diff --git a/tools/all_packages.sh b/tools/all_packages.sh index ac438b37..e3775b4c 100755 --- a/tools/all_packages.sh +++ b/tools/all_packages.sh @@ -2,11 +2,14 @@ SCRIPT_DIRNAME=$(dirname $0) +[ -z "$1" ] && echo "no command provided" && exit 1 + COMMAND="$1" SETUP_PY_LIST=" $SCRIPT_DIRNAME/setup.py.d/core.py $SCRIPT_DIRNAME/setup.py.d/core-qt.py +$SCRIPT_DIRNAME/setup.py.d/core-webkit-formatter.py $SCRIPT_DIRNAME/setup.py.d/backends-bank.py $SCRIPT_DIRNAME/setup.py.d/backends-dating.py diff --git a/tools/setup.py.d/qweboobcfg.py b/tools/setup.py.d/core-qt.py similarity index 73% rename from tools/setup.py.d/qweboobcfg.py rename to tools/setup.py.d/core-qt.py index 3dab2be4..bbd5a3f3 100755 --- a/tools/setup.py.d/qweboobcfg.py +++ b/tools/setup.py.d/core-qt.py @@ -22,28 +22,33 @@ from setuptools import setup import os -os.system('make -C weboob/applications/qweboobcfg/ui') +os.system('make -C weboob/tools/application/qt') setup( - name='weboob-qweboobcfg', + name='weboob-core-qt', version='0.1', - description='QWeboobCfg, the Weboob GUI configuration tool', - long_description='Configure backends', + description='Weboob, Web Out Of Browsers - core library, Qt configuration GUI', + long_description='Configure backends using a Qt GUI.', author='Romain Bignon', author_email='weboob@lists.symlink.me', license='GPLv3', - url='http://weboob.org/QWeboobCfg', - namespace_packages = ['weboob', 'weboob.applications'], - packages=[ + url='http://www.weboob.org', + namespace_packages = [ 'weboob', 'weboob.applications', + 'weboob.tools', + 'weboob.tools.application', + ], + packages=[ + 'weboob', 'weboob.applications.qweboobcfg', - 'weboob.applications.qweboobcfg.ui', + 'weboob.tools.application.qt', ], scripts=[ 'scripts/qweboobcfg', ], install_requires=[ 'weboob-core', + 'PyQt', ], ) diff --git a/tools/setup.py.d/core-webkit-formatter.py b/tools/setup.py.d/core-webkit-formatter.py new file mode 100755 index 00000000..5f7b8806 --- /dev/null +++ b/tools/setup.py.d/core-webkit-formatter.py @@ -0,0 +1,53 @@ +#! /usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright(C) 2010 Christophe Benz +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +from setuptools import setup + + +setup( + name='weboob-core-webkit', + version='0.1', + description='Weboob, Web Out Of Browsers - core library, WebKit formatter', + author='Christophe Benz', + author_email='weboob@lists.symlink.me', + license='GPLv3', + url='http://www.weboob.org', + classifiers=[ + 'Development Status :: 3 - Alpha', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU General Public License (GPL)', + 'Natural Language :: English', + 'Programming Language :: Python', + 'Topic :: Internet', + ], + namespace_packages = [ + 'weboob', + 'weboob.tools', + 'weboob.tools.application', + 'weboob.tools.application.formatters', + ], + packages=[ + 'weboob.tools.application.formatters.webkit', + ], + install_requires=[ + 'weboob-core', + # webkit dependency, is not an egg? + ], +) diff --git a/tools/setup.py.d/core.py b/tools/setup.py.d/core.py index 37ab40a6..f611cf48 100755 --- a/tools/setup.py.d/core.py +++ b/tools/setup.py.d/core.py @@ -39,7 +39,12 @@ setup( 'Topic :: Internet', ], # keywords='', - namespace_packages = ['weboob', 'weboob.applications'], + namespace_packages = [ + 'weboob', + 'weboob.applications', + 'weboob.tools', + 'weboob.tools.application', + ], packages=[ 'weboob', 'weboob.applications', @@ -61,6 +66,6 @@ setup( 'scripts/weboob-tests', ], install_requires=[ - 'dateutil', + 'python-dateutil', ], ) diff --git a/weboob/tools/__init__.py b/weboob/tools/__init__.py index e69de29b..de40ea7c 100644 --- a/weboob/tools/__init__.py +++ b/weboob/tools/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/weboob/tools/application/__init__.py b/weboob/tools/application/__init__.py index a89b9653..de40ea7c 100644 --- a/weboob/tools/application/__init__.py +++ b/weboob/tools/application/__init__.py @@ -1,26 +1 @@ -# -*- coding: utf-8 -*- - -# Copyright(C) 2010 Romain Bignon -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -from .base import BaseApplication, ConfigError -from .console import ConsoleApplication -from .prompt import PromptApplication - -try: - from .qt import QtApplication -except ImportError: - pass +__import__('pkg_resources').declare_namespace(__name__) diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py index bcf4d11b..d0ff8deb 100644 --- a/weboob/tools/application/console.py +++ b/weboob/tools/application/console.py @@ -27,7 +27,7 @@ from weboob.core.bcall import CallErrors from weboob.core.modules import BackendsConfig from .base import BaseApplication -from .formatters import formatters +from .formatters.instances import formatters from .results import ResultsCondition, ResultsConditionException diff --git a/weboob/tools/application/formatters/__init__.py b/weboob/tools/application/formatters/__init__.py index 07c46cf2..de40ea7c 100644 --- a/weboob/tools/application/formatters/__init__.py +++ b/weboob/tools/application/formatters/__init__.py @@ -1,44 +1 @@ -# -*- coding: utf-8 -*- - -# Copyright(C) 2010 Christophe Benz -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -from .multiline import MultilineFormatter -from .simple import SimpleFormatter - - -__all__ = ['formatters'] - - -formatters = dict( - multiline=MultilineFormatter(), - simple=SimpleFormatter(), - ) - -try: - from .table import TableFormatter - formatters.update(dict( - table=TableFormatter(), - htmltable=TableFormatter(result_funcname='get_html_string'), - )) - try: - from .webkitgtk import WebkitGtkFormatter - formatters.update(dict( - webkit=WebkitGtkFormatter(), - )) - except ImportError: - pass -except ImportError: - pass +__import__('pkg_resources').declare_namespace(__name__) diff --git a/weboob/tools/application/formatters/instances.py b/weboob/tools/application/formatters/instances.py new file mode 100644 index 00000000..3090b153 --- /dev/null +++ b/weboob/tools/application/formatters/instances.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- + +# Copyright(C) 2010 Christophe Benz +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +from .multiline import MultilineFormatter +from .simple import SimpleFormatter + + +__all__ = ['formatters'] + + +formatters = dict( + multiline=MultilineFormatter(), + simple=SimpleFormatter(), + ) + +try: + from .table import TableFormatter + formatters.update(dict( + table=TableFormatter(), + htmltable=TableFormatter(result_funcname='get_html_string'), + )) + try: + from .webkit import WebkitGtkFormatter + formatters.update(dict( + webkit=WebkitGtkFormatter(), + )) + except ImportError: + pass +except ImportError: + pass diff --git a/weboob/tools/application/formatters/webkit/__init__.py b/weboob/tools/application/formatters/webkit/__init__.py new file mode 100644 index 00000000..c4813c56 --- /dev/null +++ b/weboob/tools/application/formatters/webkit/__init__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +# Copyright(C) 2010 Christophe Benz +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +from .webkitgtk import WebkitGtkFormatter diff --git a/weboob/tools/application/formatters/webkitgtk.py b/weboob/tools/application/formatters/webkit/webkitgtk.py similarity index 100% rename from weboob/tools/application/formatters/webkitgtk.py rename to weboob/tools/application/formatters/webkit/webkitgtk.py