From 3ea19b074021f6be334fabb4c5a0dcc88b12ef93 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Sat, 19 Jun 2010 20:46:05 +0200 Subject: [PATCH 1/2] Unbundle of all external modules. Move all libraries in external into subfolders and place a custom __init__.py into each of them. This way the system installed ones are tried first, before falling back to the bundled ones. Now every distribution can properly depend on the upstream library. (e.g. bundled libraries are not allowed in fedora) Signed-off-by: Toshio Ernie Kuratomi Signed-off-by: Thomas Spura --- setupbase.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/setupbase.py b/setupbase.py index 946f573d2..ec723a19b 100644 --- a/setupbase.py +++ b/setupbase.py @@ -108,6 +108,18 @@ def find_packages(): add_package(packages, 'deathrow', tests=True) add_package(packages, 'extensions') add_package(packages, 'external') + add_package(packages, 'external.argparse') + add_package(packages, 'external.configobj') + add_package(packages, 'external.decorator') + add_package(packages, 'external.decorators') + add_package(packages, 'external.guid') + add_package(packages, 'external.Itpl') + add_package(packages, 'external.mglob') + add_package(packages, 'external.path') + add_package(packages, 'external.pretty') + add_package(packages, 'external.pyparsing') + add_package(packages, 'external.simplegeneric') + add_package(packages, 'external.validate') add_package(packages, 'frontend') add_package(packages, 'frontend.qt') add_package(packages, 'frontend.qt.console', tests=True) From 0cc0201b33fd6572c733960ac1105feb102c9784 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Mon, 24 Jan 2011 19:29:06 +0100 Subject: [PATCH 2/2] Move pretty into lib, because it's heavily changed now. --- setupbase.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setupbase.py b/setupbase.py index ec723a19b..87b2a0bfc 100644 --- a/setupbase.py +++ b/setupbase.py @@ -116,7 +116,6 @@ def find_packages(): add_package(packages, 'external.Itpl') add_package(packages, 'external.mglob') add_package(packages, 'external.path') - add_package(packages, 'external.pretty') add_package(packages, 'external.pyparsing') add_package(packages, 'external.simplegeneric') add_package(packages, 'external.validate')