From: Alexander Kanevskiy Date: Tue, 13 Aug 2013 13:01:07 +0000 (+0300) Subject: Use config files properly inside virtualenv X-Git-Tag: submit/devel/20190730.075356~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcf5a727e10f22fea70758f01f34f6b9ff42c2d3;p=services%2Fgerrithooks.git Use config files properly inside virtualenv --- diff --git a/gerrithooks/misc.py b/gerrithooks/misc.py index 967cf86..b74d313 100644 --- a/gerrithooks/misc.py +++ b/gerrithooks/misc.py @@ -26,6 +26,7 @@ import pwd import logging import logging.config +from pkg_resources import resource_filename def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): """Daemonize process""" @@ -138,6 +139,10 @@ def find_config(name, dirs=None, subdir=None): confpath = os.path.join(dirname, name) if os.access(confpath, os.R_OK): return confpath + if os.getenv('VIRTUAL_ENV'): + resource_conf = resource_filename(__package__, name) + if resource_conf and os.access(resource_conf, os.R_OK): + return resource_conf return None def configure_logging(appname): diff --git a/setup.py b/setup.py index bed5e73..736fe8b 100755 --- a/setup.py +++ b/setup.py @@ -18,27 +18,31 @@ setup ( description = "Collection of useful hooks for Gerrit", long_description = README, # url = "http://", - include_package_data=True, - data_files=[("/etc/gerrit-hooks", ["gerrit-hooks.conf", "gerrit-hooks-log.conf"])], + include_package_data = True, + zip_safe = [True, False][bool(os.getenv('VIRTUAL_ENV'))], + data_files = [ + (['/etc/gerrit-hooks', 'gerrithooks'][bool(os.getenv('VIRTUAL_ENV'))], + ["gerrit-hooks.conf", "gerrit-hooks-log.conf"]) + ], author = "Alexander Kanevskiy", author_email = "alexander.kanevskiy@intel.com", keywords = "gerrit hooks", platforms="Python 2.7", entry_points={ - 'console_scripts': [ - 'gerrit-change-abandoned = gerrithooks.change_abandoned:main', - 'gerrit-change-merged = gerrithooks.change_merged:main', - 'gerrit-change-restored = gerrithooks.change_restored:main', - 'gerrit-cla-signed = gerrithooks.cla_signed:main', - 'gerrit-comment-added = gerrithooks.comment_added:main', - 'gerrit-draft-published = gerrithooks.draft_published:main', - 'gerrit-merge-failed = gerrithooks.merge_failed:main', - 'gerrit-patchset-created = gerrithooks.patchset_created:main', - 'gerrit-ref-update = gerrithooks.ref_update:main', - 'gerrit-ref-updated = gerrithooks.ref_updated:main', - 'gerrit-reviewer-added = gerrithooks.reviewer_added:main' - ] - }, + 'console_scripts': [ + 'gerrit-change-abandoned = gerrithooks.change_abandoned:main', + 'gerrit-change-merged = gerrithooks.change_merged:main', + 'gerrit-change-restored = gerrithooks.change_restored:main', + 'gerrit-cla-signed = gerrithooks.cla_signed:main', + 'gerrit-comment-added = gerrithooks.comment_added:main', + 'gerrit-draft-published = gerrithooks.draft_published:main', + 'gerrit-merge-failed = gerrithooks.merge_failed:main', + 'gerrit-patchset-created = gerrithooks.patchset_created:main', + 'gerrit-ref-update = gerrithooks.ref_update:main', + 'gerrit-ref-updated = gerrithooks.ref_updated:main', + 'gerrit-reviewer-added = gerrithooks.reviewer_added:main' + ] + }, classifiers=[ "Development Status :: 3 - Alpha", "Environment :: Console",