Merge pull request #114 from alimanfoo/upgrade_env_20170213

Upgrade CI and dev environment

.travis.yml

@@ -4,11 +4,11 @@ python:
   - 2.7
   - 3.4
   - 3.5
+  - 3.6
 
 install:
-  - pip install -U tox-travis
-  - pip install -U pip setuptools setuptools_scm wheel
-  - pip install -U nose -rrequirements.txt
+  - pip install -U tox-travis pip setuptools wheel
+  - pip install -r requirements_dev.txt
   - python setup.py build_ext --inplace
 
 script:

appveyor.yml

@@ -1,3 +1,7 @@
+branches:
+  only:
+    - master
+
 environment:
 
   global:
@@ -28,17 +32,21 @@ environment:
     - PYTHON: "C:\\Python35-x64"
       PYTHON_VERSION: "3.5"
 
+    - PYTHON: "C:\\Python36"
+      PYTHON_VERSION: "3.6"
+
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6"
+
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - git submodule update --init --recursive
 
 build: off
 
 test_script:
-  - "%CMD_IN_ENV% python -m pip install -U pip"
-  - "%CMD_IN_ENV% python -m pip install -U setuptools wheel"
-  - "%CMD_IN_ENV% python -m pip install -rrequirements_test.txt"
-  - "%CMD_IN_ENV% python -m pip install -rrequirements.txt"
+  - "%CMD_IN_ENV% python -m pip install -U pip setuptools wheel"
+  - "%CMD_IN_ENV% python -m pip install -rrequirements_dev.txt"
   - "%CMD_IN_ENV% python setup.py build_ext --inplace"
   - "%CMD_IN_ENV% python -m nose -v"
 

docs/tutorial.rst

@@ -233,7 +233,7 @@ LZMA's built-in delta filter::
     >>> z
     Array((10000, 10000), int32, chunks=(1000, 1000), order=C)
       nbytes: 381.5M; nbytes_stored: 248.9K; ratio: 1569.7; initialized: 100/100
-      compressor: LZMA(format=1, check=-1, preset=None, filters=[{'dist': 4, 'id': 3}, {'preset': 1, 'id': 33}])
+      compressor: LZMA(format=1, check=-1, preset=None, filters=[{'dist': 4, 'id': 3}, {'id': 33, 'preset': 1}])
       store: dict
 
 The default compressor can be changed by setting the value of the

requirements_dev.txt

@@ -0,0 +1,26 @@
+# pinned dependencies for the development and CI environment
+appdirs==1.4.0
+args==0.1.0
+clint==0.5.1
+coverage==4.3.4
+Cython==0.25.2
+fasteners==0.14.1
+flake8==3.3.0
+mccabe==0.6.1
+monotonic==1.2
+nose==1.3.7
+numpy==1.12.0
+packaging==16.8
+pkginfo==1.4.1
+pluggy==0.4.0
+py==1.4.32
+pycodestyle==2.3.1
+pyflakes==1.5.0
+pyparsing==2.1.10
+requests==2.13.0
+requests-toolbelt==0.7.1
+setuptools-scm==1.15.0
+six==1.10.0
+tox==2.6.0
+twine==1.8.1
+virtualenv==15.1.0

tox.ini

@@ -4,21 +4,20 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, docs
+envlist = py27, py34, py35, py36, docs
 
 [testenv]
 setenv =
     PYTHONHASHSEED = 42
 commands =
     python setup.py build_ext --inplace
-    py27: nosetests -v zarr
-    py34,py35: nosetests -v --with-coverage --cover-erase --cover-min-percentage=100 --cover-package=zarr --with-doctest --doctest-options=+NORMALIZE_WHITESPACE zarr
-    py34,py35: python -m doctest -o NORMALIZE_WHITESPACE -o ELLIPSIS docs/tutorial.rst docs/spec/v2.rst
-    py35: flake8 zarr
+    py27,py34,py35: nosetests -v zarr
+    py36: nosetests -v --with-coverage --cover-erase --cover-min-percentage=100 --cover-package=zarr --with-doctest --doctest-options=+NORMALIZE_WHITESPACE zarr
+    py36: python -m doctest -o NORMALIZE_WHITESPACE -o ELLIPSIS docs/tutorial.rst docs/spec/v2.rst
+    py36: flake8 zarr
     python setup.py bdist_wheel
 deps =
-    -rrequirements_test.txt
-    -rrequirements.txt
+    -rrequirements_dev.txt
 
 [testenv:docs]
 basepython = python2.7