Skip to content

Commit

Permalink
Merge pull request enthought#60 from enthought/minor-cleanup-after-0.…
Browse files Browse the repository at this point in the history
…2.1-release

Minor cleanup after 0.2.1 release
  • Loading branch information
itziakos committed Apr 14, 2014
2 parents 04c1408 + ed55921 commit d6fa242
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ Release 0.2.1
-------------

* Fix TraitView parenting bug (#32)
* Fix items subscription for trait collections (#55).
* Fix items subscription for trait collections (#55 and #57).
* Cleanup testing framework and improve test coverage.
* Travis-CI now runs also on the latest enaml and atom versions
* Test coverage is reported through Coveralls.io
* Support enaml 0.9.x

Release 0.2.0
-------------
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
#html_logo = None
html_logo = "_static/e-logo-rev.png"

# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None
html_favicon = "_static/et.ico"

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
Expand Down Expand Up @@ -191,7 +191,7 @@

# The name of an image file (relative to this directory) to place at the top of
# the title page.
#latex_logo = None
latex_logo = "e-logo-rev.png"

# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
Expand Down
3 changes: 1 addition & 2 deletions traits_enaml/testing/event_loop_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ def event_loop_with_timeout(self, repeat=2, timeout=10.0):
repeat : int
Number of times to process events. Default is 2.
timeout: float, optional, keyword only
Number of seconds to run the event loop in the case that the trait
change does not occur. Default value is 10.0.
Number of seconds to run the event loop. Default value is 10.0.
"""
def repeat_loop(condition, repeat):
Expand Down

0 comments on commit d6fa242

Please sign in to comment.