Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow registering the dict->IContext adapters other than at import time. #15

Merged
merged 5 commits into from
Feb 28, 2014

Conversation

pberkes
Copy link

@pberkes pberkes commented Feb 24, 2014

Instead of just registering the adapters from dict to IContext and ICheckpointable, provide AdaptationOffers for both, and introduce a function to register them to an adaptation manager of choice.

This allows to use the adapters in a context where the adaptation manager is not the global one, or
where the adaptation manager is reset (e.g., unittesting).

@pberkes
Copy link
Author

pberkes commented Feb 24, 2014

ok to test

@pberkes
Copy link
Author

pberkes commented Feb 24, 2014

Depends on enthought/traits#145

Pietro Berkes and others added 2 commits February 24, 2014 15:35
# Via Ioannis Tziakos (1) and IoannisTziakos (1)
* master:
  use the right environment variable
  we need cython after all
  more updates
  add etsdevtools in the installation
  install unittest2 when running under python 2.6
  add blockcanvas in the setup
  add apptools in the trvis-ci configuration
  remove cython since it should not be required
  update travis configuration
  add a dev-requirements file
  add a coverage rc configuration

Conflicts:
	.travis.yml
@itziakos
Copy link
Member

@pberkes, I have merged master back to this PR so that the updated travis configuration is picked up

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling c711ddc on fix/global-adapters-registration into c5ac3b6 on master.

@pberkes
Copy link
Author

pberkes commented Feb 25, 2014

enthought/traits#145 has been merged -- this PR is ready for review

@pberkes
Copy link
Author

pberkes commented Feb 26, 2014

I'd like to merge it tomorrow to match the merged traits PR. Then I'll make a PR on meta-ETS with the traits and codetools with both changes.

pberkes pushed a commit that referenced this pull request Feb 28, 2014
Allow registering the dict->IContext adapters other than at import time.
@pberkes pberkes merged commit e6d541f into master Feb 28, 2014
@pberkes pberkes deleted the fix/global-adapters-registration branch February 28, 2014 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants