Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# http://travis-ci.org/#!/jupyter-contrib/jupyter_nbextensions_configurator
# http://travis-ci.com/#!/jupyter-contrib/jupyter_nbextensions_configurator
language: python
sudo: false
addons:
Expand All @@ -15,15 +15,12 @@ matrix:
env: TOXENV=lint
# check that conda build/install works
- os: linux
python: '3.7'
python: '3.6'
env: TOXENV=condarecipe
# linux, various python and notebook versions
- os: linux
python: '3.6'
env: TOXENV=py36-notebook
- os: linux
python: '3.7'
env: TOXENV=py37-notebook
- os: linux
python: 'pypy'
env: TOXENV=pypy-notebook
Expand Down
45 changes: 15 additions & 30 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,21 @@ cache:
- '%LOCALAPPDATA%\pip\Cache'
environment:
matrix:
- TOXENV: 'py27-notebook'
TOXPYTHON: C:\Python27\python.exe
PYTHON_HOME: C:\Python27
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '32'
- TOXENV: 'py33-notebook'
TOXPYTHON: C:\Python33\python.exe
PYTHON_HOME: C:\Python33
PYTHON_VERSION: '3.3'
PYTHON_ARCH: '32'
- TOXENV: 'py34-notebook40'
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '32'
- TOXENV: 'py34-notebook41'
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '32'
- TOXENV: 'py34-notebook4x'
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
PYTHON_ARCH: '32'
- TOXENV: 'py35-notebook'
TOXPYTHON: C:\Python35\python.exe
PYTHON_HOME: C:\Python35
PYTHON_VERSION: '3.5'
PYTHON_ARCH: '32'
- TOXENV: 'py36-notebook57'
TOXPYTHON: C:\Python36-x64\python.exe
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '64'
- TOXENV: 'py36-notebook64'
TOXPYTHON: C:\Python36-x64\python.exe
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '64'
- TOXENV: 'py36-notebook'
TOXPYTHON: C:\Python36-x64\python.exe
PYTHON_HOME: C:\Python36-x64
PYTHON_VERSION: '3.6'
PYTHON_ARCH: '64'
init:
- ps: echo $env:TOXENV
- ps: ls C:\Python*
Expand Down
6 changes: 5 additions & 1 deletion tests/nbextensions_test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
from selenium.webdriver.remote import remote_connection
from selenium.webdriver.support import expected_conditions as ec
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
# don't show selenium debug logs
remote_connection.LOGGER.setLevel(logging.INFO)

Expand Down Expand Up @@ -227,6 +228,7 @@ def init_webdriver(cls):
# 'platform': 'Mac OS X 10.9',
'platform': 'Linux',
'browserName': 'firefox',
'marionette': False,
'version': 'latest',
'tags': [os.environ['TOXENV'], 'CI'],
'name': cls.__name__
Expand All @@ -244,7 +246,9 @@ def init_webdriver(cls):
desired_capabilities=capabilities, command_executor=hub_url)
else:
cls.log.info('Using local webdriver.')
cls.driver = webdriver.Firefox()
cap = DesiredCapabilities().FIREFOX
cap["marionette"] = False
cls.driver = webdriver.Firefox(capabilities=cap)
return cls.driver

def run(self, results):
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ deps =
notebookmaster: https://github.com/jupyter/notebook/archive/master.zip
notebook: notebook
requests
selenium>=4.3
selenium
commands =
{posargs:coverage run --parallel-mode --source=src -m nose -vv -a '!uses_jupyterhub' tests}

Expand Down