8000 Mpl traitlets by tacaswell · Pull Request #4694 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Mpl traitlets #4694

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.

Sign up for GitHub

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

Closed
wants to merge 9 commits into from
Closed

Mpl traitlets #4694

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b83af3f
begin merge of mpl and ipython traitlets
rmorshea Jul 12, 2015
0d88251
Added Color TraitType and tests
AndreLobato Jul 12, 2015
8d73da2
Merge pull request #1 from AndreLobato/mpl_traitlets
rmorshea Jul 12, 2015
19a9ca2
update mpl traitlets
rmorshea Jul 12, 2015
9c3c639
bad plot from pyplot
rmorshea Jul 15, 2015
3ac8672
resolved some issues, simple pyplot.plot(x,y) works
rmorshea Jul 15, 2015
4056c30
resolved some issues, simple pyplot.plot(x,y) works
rmorshea Jul 15, 2015
96c23a9
more tests passed
rmorshea Jul 17, 2015
1ddcd3d
update
rmorshea Jul 17, 2015
File filter

Filter by extension

Filter by extension
8000
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more tests passed
  • Loading branch information
@rmorshea
rmorshea committed Jul 17, 2015
commit 96c23a98567b0899583ec7ffa7219737172036d7
25 changes: 13 additions & 12 deletions lib/matplotlib/traitlets.py
View file
Open in desktop 9720
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
from __future__ import (absolute_import, division,
print_function, unicode_literals)

#ipython 4 import
from traitlets.config import Configurable
from traitlets import (Int, Float, Bool, Dict, List, Instance,
Union, TraitError, HasTraits, Unicode,
NoDefaultSpecified, TraitType, Tuple,
Undefined)

# ipython 3 imports
# from IPython.config import Configurable
# from IPython.utils.traitlets import (Int, Float, Bool, Dict, List, Instance,
# Union, TraitError, HasTraits,
# NoDefaultSpecified, TraitType)
try:
# IPython 4 import
from traitlets.config import Configurable
from traitlets import (Int, Float, Bool, Dict, List, Instance,
Union, TraitError, HasTraits, Unicode,
NoDefaultSpecified, TraitType, Tuple,
Undefined, TraitError, getargspec)
except ImportError:
# IPython 3 import
from IPython.utils.traitlest.config import Configurable
from IPython.utils.traitlets import (Int, Float, Bool, Dict, List, Instance,
Union, TraitError, HasTraits, TraitError,
NoDefaultSpecified, TraitType)
import numpy as np

# override for backward compatability
Expand Down
0