From 38ae1cd880f7e7a5500e02d79ffa377e181853db Mon Sep 17 00:00:00 2001 From: damianavila Date: Tue, 18 Apr 2017 11:27:38 -0300 Subject: [PATCH 1/2] Adding py36 run on CI, bump version and update README --- .travis.yml | 6 +++--- README.md | 8 ++++++++ appveyor.yml | 20 ++++++++++---------- nb_conda/_version.py | 2 +- package.json | 2 +- requirements.txt | 2 +- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index b97549fa..18722aa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ branches: python: # We don't actually use the Travis Python, but this keeps it organized. - "2.7" - - "3.4" - "3.5" + - "3.6" install: - sudo apt-get update @@ -28,13 +28,13 @@ install: - conda install -n root conda conda-env anaconda-client - conda info -a - conda create -n nb_conda python=$TRAVIS_PYTHON_VERSION - - conda install -n nb_conda -c conda-forge --file requirements.txt + - conda install -n nb_conda --file requirements.txt - source activate nb_conda - pip install python-coveralls - npm install script: - - python setup.py develop + - pip install -e . - jupyter nbextension install nb_conda --py --sys-prefix --symlink - jupyter nbextension enable nb_conda --py --sys-prefix - jupyter serverextension enable nb_conda --py --sys-prefix diff --git a/README.md b/README.md index cbf49d14..acb37111 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,14 @@ jupyter serverextension enable nb_conda --py --sys-prefix ## Changelog +### 2.2.0 +- support conda 4.3 +- support notebook security fix introduced in notebook 4.3.1 + +### 2.1.0 +- fix environment export button +- allow environment names with one letter and validate against "suspicious" characters + ### 2.0.0 - update to new nb_conda_kernels naming scheme - namespace all API calls into `/conda/` diff --git a/appveyor.yml b/appveyor.yml index 3df589ef..7be831f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,21 +14,21 @@ environment: - TARGET_ARCH: "x86" CONDA_PY: "27" PY_CONDITION: "python >=2.7,<3" - - TARGET_ARCH: "x86" - CONDA_PY: "34" - PY_CONDITION: "python >=3.4,<3.5" - TARGET_ARCH: "x86" CONDA_PY: "35" - PY_CONDITION: "python >=3.5" + PY_CONDITION: "python >=3.5,<3.6" + - TARGET_ARCH: "x86" + CONDA_PY: "36" + PY_CONDITION: "python >=3.6" - TARGET_ARCH: "x64" CONDA_PY: "27" PY_CONDITION: "python >=2.7,<3" - - TARGET_ARCH: "x64" - CONDA_PY: "34" - PY_CONDITION: "python >=3.4,<3.5" - TARGET_ARCH: "x64" CONDA_PY: "35" - PY_CONDITION: "python >=3.5" + PY_CONDITION: "python >=3.5,<3.6" + - TARGET_ARCH: "x64" + CONDA_PY: "36" + PY_CONDITION: "python >=3.6" # We always use a 64-bit machine, but can build x86 distributions @@ -60,7 +60,7 @@ install: - cmd: set PYTHONUNBUFFERED=1 - cmd: conda info - cmd: conda create -n nb_conda "%PY_CONDITION%" - - cmd: conda install -n nb_conda -c conda-forge --file requirements.txt + - cmd: conda install -n nb_conda --file requirements.txt - cmd: activate nb_conda - cmd: npm install @@ -68,7 +68,7 @@ install: build: off test_script: - - cmd: python setup.py develop + - cmd: pip install -e . - cmd: jupyter nbextension install nb_conda --py --sys-prefix - cmd: jupyter nbextension enable nb_conda --py --sys-prefix - cmd: jupyter serverextension enable nb_conda --py --sys-prefix diff --git a/nb_conda/_version.py b/nb_conda/_version.py index a3026dac..ea7d461b 100644 --- a/nb_conda/_version.py +++ b/nb_conda/_version.py @@ -1,2 +1,2 @@ -version_info = (2, 1, 0) +version_info = (2, 2, 0) __version__ = '.'.join(map(str, version_info)) diff --git a/package.json b/package.json index 68bad1c4..40be05f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nb_conda", - "version": "2.1.0", + "version": "2.2.0", "description": "Development tools for nb_conda", "main": "index.js", "scripts": { diff --git a/requirements.txt b/requirements.txt index fcbc1088..b5764a50 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ mock nb_conda_kernels >=2.0.0 nodejs nose -notebook >=4.2.0 +notebook >=4.3.1 python requests From 7b85b6a8b735f257496194654b53232580cb2e9d Mon Sep 17 00:00:00 2001 From: damianavila Date: Tue, 18 Apr 2017 12:54:24 -0300 Subject: [PATCH 2/2] Use conda-forge to avoid issues with defaults --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18722aa5..9f2a804e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: - conda install -n root conda conda-env anaconda-client - conda info -a - conda create -n nb_conda python=$TRAVIS_PYTHON_VERSION - - conda install -n nb_conda --file requirements.txt + - conda install -n nb_conda -c conda-forge --file requirements.txt - source activate nb_conda - pip install python-coveralls - npm install diff --git a/appveyor.yml b/appveyor.yml index 7be831f0..0e962484 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -60,7 +60,7 @@ install: - cmd: set PYTHONUNBUFFERED=1 - cmd: conda info - cmd: conda create -n nb_conda "%PY_CONDITION%" - - cmd: conda install -n nb_conda --file requirements.txt + - cmd: conda install -n nb_conda -c conda-forge --file requirements.txt - cmd: activate nb_conda - cmd: npm install