diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-21 21:22:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-21 21:22:42 +0000 |
| commit | 06828ebbe38960111b37431e16a6ad7ee7dd8c87 (patch) | |
| tree | 2b02266f10bb3ce6df7f924147bae7887771295b | |
| parent | aa7a6fd3270710e533f84e04c84a94d46fa15266 (diff) | |
| parent | d09372e59e0a951867da65cd152e7d3f0e8faf0f (diff) | |
| download | pbr-06828ebbe38960111b37431e16a6ad7ee7dd8c87.tar.gz | |
Merge "Set defaults directly in option processing"
| -rw-r--r-- | pbr/d2to1/util.py | 4 | ||||
| -rw-r--r-- | pbr/hooks/backwards.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pbr/d2to1/util.py b/pbr/d2to1/util.py index 583c6b8..c421014 100644 --- a/pbr/d2to1/util.py +++ b/pbr/d2to1/util.py @@ -235,6 +235,10 @@ def cfg_to_args(path='setup.cfg'): kwargs = setup_cfg_to_setup_kwargs(config) + # Set default config overrides + kwargs['include_package_data'] = True + kwargs['zip_safe'] = False + register_custom_compilers(config) ext_modules = get_extension_modules(config) diff --git a/pbr/hooks/backwards.py b/pbr/hooks/backwards.py index d9183b3..de92eef 100644 --- a/pbr/hooks/backwards.py +++ b/pbr/hooks/backwards.py @@ -24,7 +24,6 @@ class BackwardsCompatConfig(base.BaseConfig): section = 'backwards_compat' def hook(self): - self.config['include_package_data'] = 'True' packaging.append_text_list( self.config, 'dependency_links', packaging.parse_dependency_links()) |