##// END OF EJS Templates
Merge pull request #12474 from meeseeksmachine/auto-backport-of-pr-12473-on-7.x
Matthias Bussonnier -
r25935:0ddc9551 merge
parent child Browse files
Show More
@@ -43,7 +43,7 b' install:'
43 fi
43 fi
44 - pip install -e file://$PWD#egg=ipython[test] --upgrade
44 - pip install -e file://$PWD#egg=ipython[test] --upgrade
45 - pip install trio curio --upgrade --upgrade-strategy eager
45 - pip install trio curio --upgrade --upgrade-strategy eager
46 - pip install pytest 'matplotlib !=3.2.0' mypy
46 - pip install 'pytest<6' 'matplotlib !=3.2.0' mypy
47 - pip install codecov check-manifest --upgrade
47 - pip install codecov check-manifest --upgrade
48
48
49 script:
49 script:
@@ -432,7 +432,7 b' class BaseFormatter(Configurable):'
432 """Add a format function for a given type.
432 """Add a format function for a given type.
433
433
434 Parameters
434 Parameters
435 -----------
435 ----------
436 typ : type or '__module__.__name__' string for a type
436 typ : type or '__module__.__name__' string for a type
437 The class of the object that will be formatted using `func`.
437 The class of the object that will be formatted using `func`.
438 func : callable
438 func : callable
@@ -198,7 +198,7 b' def ipexec(fname, options=None, commands=()):'
198 ipython_cmd = get_ipython_cmd()
198 ipython_cmd = get_ipython_cmd()
199 # Absolute path for filename
199 # Absolute path for filename
200 full_fname = os.path.join(test_dir, fname)
200 full_fname = os.path.join(test_dir, fname)
201 full_cmd = ipython_cmd + cmdargs + [full_fname]
201 full_cmd = ipython_cmd + cmdargs + ['--', full_fname]
202 env = os.environ.copy()
202 env = os.environ.copy()
203 # FIXME: ignore all warnings in ipexec while we have shims
203 # FIXME: ignore all warnings in ipexec while we have shims
204 # should we keep suppressing warnings here, even after removing shims?
204 # should we keep suppressing warnings here, even after removing shims?
General Comments 0
You need to be logged in to leave comments. Login now