Merge pull request #53 from Anaconda-Platform/latestpy

Update CI with py36, bump versions and some info

.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
@@ -34,7 +34,7 @@ install:
   - 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

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/`

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
@@ -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

nb_conda/_version.py

@@ -1,2 +1,2 @@
-version_info = (2, 1, 0)
+version_info = (2, 2, 0)
 __version__ = '.'.join(map(str, version_info))

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": {

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