Merge lp:~james-w/python-oops-dictconfig/instance-id-default into lp:python-oops-dictconfig
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~james-w/python-oops-dictconfig/instance-id-default | ||||
Merge into: | lp:python-oops-dictconfig | ||||
Diff against target: |
86 lines (+22/-4) 5 files modified
README (+0/-3) oops_dictconfig/configglue_options.py (+1/-0) oops_dictconfig/tests/__init__.py (+1/-0) oops_dictconfig/tests/test_configglue_options.py (+19/-0) tarmac_tests.sh (+1/-1) |
||||
To merge this branch: | bzr merge lp:~james-w/python-oops-dictconfig/instance-id-default | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Westby (community) | Approve | ||
Diogo Baeder (community) | Approve | ||
Review via email: mp+146477@code.launchpad.net |
Commit message
Default instance_id to None, otherwise there's no way to specify the sentinel value.
Also remove the use of it in the examples, its use is deprecated, and we don't want
to give the impression that it should be used.
Description of the change
Hi,
This fixes a bug where if you used the configglue bindings for dictconfig
you would get the (deprecated) instance_id option set to '', whereas the
sentinel of None is desirable. This changes the default, so that you can
set instance_id if required, but the default will be to not use it.
Thanks,
James
Unmerged revisions
- 12. By James Westby
-
Add configglue to the extra test dependencies we install.
- 11. By James Westby
-
Add the missing file.
- 10. By James Westby
-
Default instance_id to None, otherwise there's no way to specify the sentinel value.
Also remove the use of it in the examples, its use is deprecated, and we don't want
to give the impression that it should be used.
The attempt to merge lp:~james-w/python-oops-dictconfig/instance-id-default into lp:python-oops-dictconfig failed. Below is the output from the failed tests.
Downloading/ unpacking testtools
Running setup.py egg_info for package testtools
no previously-included directories found matching 'doc/_build' unpacking oops-amqp 0.0.7.tar. gz
Downloading/
Downloading oops_amqp-
Running setup.py egg_info for package oops-amqp
Downloading/ unpacking oops-datedir-repo repo-0. 0.20.tar. gz
Downloading oops_datedir_
Running setup.py egg_info for package oops-datedir-repo
Downloading/ unpacking extras (from testtools)
Downloading extras-0.0.3.tar.gz
Running setup.py egg_info for package extras
Downloading/ unpacking pymongo (from oops-amqp)
Running setup.py egg_info for package pymongo
Requirement already satisfied (use --upgrade to upgrade): oops>=0.0.11 in ./virtualenv/ lib/python2. 7/site- packages/oops-0.0.13-py2.7.egg (from oops-amqp) unpacking amqplib (from oops-amqp)
Downloading/
Running setup.py egg_info for package amqplib
Downloading/ unpacking bson (from oops-datedir-repo)
Downloading bson-0.3.3.tar.gz
Running setup.py egg_info for package bson
Downloading/ unpacking iso8601 (from oops-datedir-repo) 0.1.4.tar. gz
Downloading iso8601-
Running setup.py egg_info for package iso8601
Downloading/ unpacking launchpadlib (from oops-datedir-repo)
Running setup.py egg_info for package launchpadlib
Requirement already satisfied (use --upgrade to upgrade): pytz in ./virtualenv/ lib/python2. 7/site- packages/ pytz-2012j- py2.7.egg (from oops-datedir-repo) unpacking httplib2 (from launchpadlib->oops-datedir-repo)
Downloading/
Running setup.py egg_info for package httplib2
Downloading/ unpacking keyring (from launchpadlib->oops-datedir-repo)
Running setup.py egg_info for package keyring
zip_safe flag not set; analyzing archive contents...
Installed /tmp/easy_ install- zkfLHo/ pytest- runner- 1.2/hgtools- 2.0.2-py2. 7.egg
Installed /mnt/tarmac/ cache/python-oops-dictconfig/trunk/ virtualenv/ build/keyring/ pytest_ runner- 1.2-py2. 7.egg
warning: no previously-included files found matching '.hg/last- message. txt' unpacking lazr.restfulcli ent>=0. 9.19 (from launchpadlib->oops-datedir-repo)
Downloading/
Running setup.py egg_info for package lazr.restfulclient
Downloading/ unpacking lazr.uri (from launchpadlib->oops-datedir-repo) 1.0.3.tar. gz
Downloading lazr.uri-
Running setup.py egg_info for package lazr.uri
Downloading/ unpacking oauth (from launchpadlib->oops-datedir-repo)
Downloading oauth-1.0.1.tar.gz
Running setup.py egg_info for package oauth
Requirement already satisfied (use --upgrade to upgrade): distribute in ./virtualenv/ lib/python2. 7/site- packages/ distribute- 0.6.24- py2.7.egg (from launchpadlib->oops-datedir-repo) unpacking simplejson (from launchpadlib->oops-datedir-repo)
Downloading/
Running setup.py egg_info for package simplejson
Downloading/ unpacking testresources (from launchpadlib->oops-datedir-repo) 0.2.7.tar. gz
Downloading testresources-
Running setup.py egg_info for package testresources
Downloading/ unpacking wadllib (from launchpadl...