Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] attempt to fix conda recipe build #955

Merged
merged 3 commits into from
Apr 12, 2017
Merged
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
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ matrix:
env: TOXENV=docs_linkcheck
# check that conda build/install works
- os: linux
python: '3.4'
python: '3.6'
env: TOXENV=condarecipe
# linux, various python and notebook versions
- os: linux
Expand Down Expand Up @@ -115,15 +115,18 @@ before_install:
- 'if [[ ${TOXENV} == "condarecipe" ]]; then hash -r; fi'
- 'if [[ ${TOXENV} == "condarecipe" ]]; then conda config --set always_yes yes --set changeps1 no; fi'
- 'if [[ ${TOXENV} == "condarecipe" ]]; then conda info -a; fi # Useful for debugging any issues with conda'
# conda 4.3.14 & conda-build 2.1.6,2.1.7 seem to fail with signals TypError on travis.
# conda >4.3.13 seems to fail with TypeError thrown by sginal_handler on travis.
# for further details, see
# https://github.com/conda/conda/issues/5033
# conda's auto-update strategy also means that installing or updating anything else will cause
# conda to attempt to update itself.
# conda to attempt to update itself, so we may need to re-specify conda version at each install/update step
# Thus instead of running
# conda update conda
# we install conda & conda-build together, specifying the versions that we
# wish to avoid
- 'if [[ ${TOXENV} == "condarecipe" ]]; then conda install "conda!=4.3.14" "conda-build!=2.1.6,!=2.1.7"; fi'
- 'if [[ ${TOXENV} == "condarecipe" ]]; then conda install "conda<4.3.14" "conda-build"; fi'
- 'if [[ ${TOXENV} == "condarecipe" ]]; then conda info -a; fi # Useful for debugging any issues with conda'
- 'if [[ ${TOXENV} == "condarecipe" ]]; then conda config --append channels conda-forge; fi # add conda-forge channel at lower priority than defaults'
- 'if [[ ${TOXENV} == "condarecipe" ]]; then git fetch --unshallow; fi'
install:
- pip install tox
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,6 @@ def main():
],
)


if __name__ == '__main__':
main()
5 changes: 2 additions & 3 deletions src/jupyter_contrib_nbextensions/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
import latex_envs
import psutil
from jupyter_contrib_core.notebook_compat import nbextensions
from jupyter_nbextensions_configurator.application import (
EnableJupyterNbextensionsConfiguratorApp,
)
from jupyter_nbextensions_configurator.application import \
EnableJupyterNbextensionsConfiguratorApp
from traitlets.config import Config
from traitlets.config.manager import BaseJSONConfigManager

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@

from __future__ import print_function

# IPython imports

from nbconvert.preprocessors import Preprocessor
from traitlets import Bool, Unicode, Enum

from nbconvert.exporters.notebook import NotebookExporter
import nbformat

from nbconvert.exporters.notebook import NotebookExporter
from nbconvert.preprocessors import Preprocessor
from traitlets import Bool, Enum, Unicode

# -----------------------------------------------------------------------------
# Preprocessor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
from __future__ import print_function

import json
from sys import getsizeof
from IPython.core.magics.namespace import NamespaceMagics

from IPython import get_ipython
import json
from IPython.core.magics.namespace import NamespaceMagics

_nms = NamespaceMagics()
_Jupyter = get_ipython()
_nms.shell = _Jupyter.kernel.shell
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,5 @@ deps =
whitelist_externals =
conda
commands =
conda config --prepend channels conda-forge # add conda-forge channel at lower priority than defaults
conda build conda.recipe
conda install --use-local jupyter_contrib_nbextensions