Skip to content

Commit

Permalink
Merge pull request enthought#56 from enthought/prepare-for-0.2.1-release
Browse files Browse the repository at this point in the history
Prepare for 0.2.1 release
  • Loading branch information
itziakos committed Mar 18, 2014
2 parents e5323d4 + 8d00c50 commit 04c1408
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ python:
env:
- BUILD_TYPE="dev"
- BUILD_TYPE="released"
- BUILD_TYPE="0.8.9"
virtualenv:
system_site_packages: true
before_install:
Expand All @@ -13,8 +14,10 @@ before_install:
- sudo apt-get install python-vtk python-qt4 python-qt4-dev python-sip python-qt4-gl libqt4-scripttools swig
install:
- pip install cython
- if [[ $BUILD_TYPE == 'dev' ]]; then git clone https://github.com/nucleic/kiwi; cd kiwi/py; python ./build.py install; cd ../..; fi
- if [[ $BUILD_TYPE == 'dev' ]]; then pip install -r dev_requirements.txt; fi
- if [[ $BUILD_TYPE == 'released' ]]; then pip install -r release_requirements.txt; fi
- if [[ $BUILD_TYPE == '0.8.9' ]]; then pip install -r enaml_0_8_9_requirements.txt; fi
- python setup.py develop
script:
- coverage run -m unittest2 discover -v
Expand Down
16 changes: 12 additions & 4 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
Traits-Enaml CHANGELOG
======================

Release 0.2.1
-------------

* Fix TraitView parenting bug (#32)
* Fix items subscription for trait collections (#55).
* 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

Release 0.2.0
-------------

Support enaml 0.8.x
Better test framework including enaml and gui testing helpers
Basic documentation
Integrate with Travis-CI
* Support enaml 0.8.x
* Better test framework including enaml and gui testing helpers
* Basic documentation
* Integrate with Travis-CI
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ traits-enaml
============

Traits-Enaml is an extension library to facilitate interoperation of `Enaml
0.8.x` with `Traits` and allow a programmer to drive enaml views using
traits models, enable/chaco components and mayavi 3D scenes.
0.8.9` and above with `Traits` and allow a programmer to drive enaml views
using traits models, enable/chaco components and mayavi 3D scenes.

References
==========
Expand Down
3 changes: 1 addition & 2 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ coverage
coveralls
-e git+http://github.com/nucleic/enaml.git#egg=enaml
-e git+http://github.com/nucleic/atom.git#egg=atom
-e git+http://github.com/enthought/casuarius.git#egg=casuarius
-e git+http://github.com/enthought/traits.git#egg=traits
-e git+http://github.com/enthought/enable.git#egg=enable
-e git+http://github.com/enthought/traitsui.git#egg=traitsui
-e git+http://github.com/enthought/enable.git#egg=enable
-e git+http://github.com/enthought/mayavi.git#egg=mayavi
15 changes: 15 additions & 0 deletions enaml_0_8_9_requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--allow-external enable
--allow-unverified enable
--allow-external PIL
--allow-unverified PIL
unittest2
ply
coverage
coveralls
casuarius
enaml==0.8.9
atom==0.3.5
traits
traitsui
enable
mayavi
2 changes: 1 addition & 1 deletion release_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ coverage
coveralls
enaml
atom
casuarius
kiwisolver
traits
enable
traitsui
Expand Down

0 comments on commit 04c1408

Please sign in to comment.