Merge pull request #137 from minrk/test-requirements

update test requirements
jupyter · Aug 31, 2016 · 5695041 · 5695041
2 parents b86a007 + 2566f48
commit 5695041
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,9 +16,8 @@ before_install:
 install:
     - source activate qtconsole
     - conda install --yes pyzmq sphinx pygments
-    - pip install  . coveralls -r requirements.txt
+    - pip install  --pre .[test] coveralls
     - python -c 'import ipykernel.kernelspec; ipykernel.kernelspec.install(user=True)'
-    - pip install nose
 script:
     - nosetests --with-coverage --cover-package qtconsole qtconsole
 after_success:

diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -91,9 +91,9 @@
 ]
 
 extras_require = setuptools_args['extras_require'] = {
+    'test': ['nose'],
     'test:python_version=="2.7"': ['mock'],
-    'test:sys_platform != "win32"': ['pexpect'],
-    'doc': 'Sphinx>=1.3'
+    'doc': 'Sphinx>=1.3',
 }
 
 if 'setuptools' in sys.modules: