Merge branch 'fix-travis'

Author: tkf

.travis.yml

@@ -31,6 +31,12 @@ env:
   - EIN_TEST_TARGET=travis-ci-zeroein EMACS=emacs-snapshot
 matrix:
   allow_failures:
+    # IPY_VERSION=0.12.*
+    - env: EIN_TEST_TARGET=travis-ci-testein IPY_VERSION=0.12.1 EMACS=emacs
+    - env: EIN_TEST_TARGET=travis-ci-testein IPY_VERSION=0.12.0 EMACS=emacs
+    - env: EIN_TEST_TARGET=travis-ci-testein IPY_VERSION=0.12.1 EMACS=emacs24
+    - env: EIN_TEST_TARGET=travis-ci-testein IPY_VERSION=0.12.0 EMACS=emacs24
+    # EMACS=emacs-snapshot
     - env: EIN_TEST_TARGET=travis-ci-testein IPY_VERSION=dev    EMACS=emacs-snapshot
     - env: EIN_TEST_TARGET=travis-ci-testein IPY_VERSION=0.13.0 EMACS=emacs-snapshot
     - env: EIN_TEST_TARGET=travis-ci-testein IPY_VERSION=0.12.1 EMACS=emacs-snapshot

Makefile

@@ -3,13 +3,28 @@ IPYTHON = env/ipy.$(IPY_VERSION)/bin/ipython
 IPY_VERSION = 0.13.0
 TESTEIN = tools/testein.py
 TESTEIN_OPTS =
+PKG_INFO = \
+grep '^Version' \
+env/ipy.$(IPY_VERSION)/lib/python*/site-packages/*.egg-info/PKG-INFO \
+| sed -r 's%.*/site-packages/(.*)-py.*\.egg-info/.*:Version: (.*)$$%\1\t\2%'
 
 testein: test-requirements
 	${MAKE} testein-1
 
 interactive-testein: test-requirements
 	${MAKE} TESTEIN_OPTS="--no-batch" testein-1
 
+clean: ert-clean
+	rm -f lisp/*.elc
+
+purge: clean
+	rm -rf env log
+
+pkg-info:
+	@echo "**************************************************"
+	@echo "Installed Python Packages"
+	$(PKG_INFO)
+
 submodule:
 	git submodule update --init
 
@@ -24,16 +39,11 @@ ert-clean:
 env-ipy.%:
 	tools/makeenv.sh env/ipy.$* tools/requirement-ipy.$*.txt
 
-env-clean:
-	rm -rf env
-
 log:
 	mkdir log
 
-log-clean:
-	rm -rf log
-
 test-requirements: ert-compile env-ipy.$(IPY_VERSION)
+	${MAKE} pkg-info
 
 travis-ci-testein: test-requirements
 	${MAKE} testein-2

tools/requirement-ipy.0.12.0.txt

@@ -1,3 +1,3 @@
 ipython==0.12
-pyzmq
+pyzmq==2.2.0.1
 tornado

tools/requirement-ipy.0.12.1.txt

@@ -1,3 +1,3 @@
 ipython==0.12.1
-pyzmq
+pyzmq==2.2.0.1
 tornado

tools/requirement-ipy.dev.txt

@@ -1,4 +1,4 @@
-https://github.com/ipython/ipython/tarball/master
+-e git://github.com/ipython/ipython.git#egg=ipython
 pyzmq
 tornado
 jinja2