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

Backport PR 522 to 4.3.x - Expose loaded config files, make load idempotent #532

Merged
merged 4 commits into from
Aug 27, 2019

Conversation

kevin-bates
Copy link
Contributor

This PR consists of 4 commits which should probably not be squashed when merged.

  1. Set the version to 4.3.3.dev until 4.3.3 or 4.4.0? is built.
  2. Since PR Expose loaded config files, make load idempotent #522 depended on a very small portion of PR add Application.show_config[_json] #341, yet add Application.show_config[_json] #341 introduced (and depended on) API-level changes destined for 5.0.0, only the required (and very small) portion of one of the commits from 341 was backported.
  3. A complete backport of Expose loaded config files, make load idempotent #522.
  4. Removed python 3.3 from travis configuration since it no longer exists.

This change only takes a very small port of PR 341.  Specifically,
its a small portion of commit eaf1ae8 that introduces the List
`_loaded_config_files` and returns a tuple from `load_config_file()`.

This was necessary since the rest of this commit and the other 5
commits introduced API-level changes that were dependent on other
changes not pertinent to a minor release.
d737580 Expose loaded config files, make load idempotent
61f25a7 Use more compatible form of copy for lists
f044185 make comment more clear
@rmorshea
Copy link
Contributor

In the absence of any other feedback, I'm going to merge this and then do a 4.3.3.dev release tomorrow or later tonight.

@rmorshea rmorshea merged commit ba96b94 into ipython:4.3.x Aug 27, 2019
@kevin-bates
Copy link
Contributor Author

@rmorshea - Is there anything I can help with to get 4.3.3 done? Thanks.

@rmorshea
Copy link
Contributor

Sorry @kevin-bates I've been really busy. Promise I'll get this done today.

@minrk minrk added this to the 4.3.3 milestone Oct 3, 2019
@@ -583,21 +584,26 @@ def _load_config_files(cls, basefilename, path=None, log=None, raise_config_file
" {1} has higher priority: {2}".format(
filename, loader.full_filename, json.dumps(collisions, indent=2),
))
yield config
yield (config, loader.full_filename)
Copy link
Member

@minrk minrk Oct 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, this is a private API that was indeed used by IPython until 5.5, so this patch-release of traitlets will break IPython <5.5 (5.8 is the last supporting Python 2 and 7.8 is current). The API that called this was somewhat rarely used (mainly in IPython.embed()).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good information @minrk - thank you.

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