Merge pull request #5 from jakirkham/fix_pr_87_conflicts

Fix conflicts with upstream `master`

Author: funkey

.gitignore

@@ -49,6 +49,9 @@ coverage.xml
 .hypothesis/
 cover/
 
+# Cython annotation files
+numcodecs/*.html
+
 # Translations
 *.mo
 *.pot

.travis.yml

@@ -13,7 +13,6 @@ addons:
 
 python:
   - 2.7
-  - 3.4
   - 3.5
   - 3.6
 

appveyor.yml

@@ -19,13 +19,6 @@ environment:
       PYTHON_VERSION: "2.7"
       DISTUTILS_USE_SDK: "1"
 
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4"
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      DISTUTILS_USE_SDK: "1"
-
     - PYTHON: "C:\\Python35"
       PYTHON_VERSION: "3.5"
 

docs/contributing.rst

@@ -145,9 +145,9 @@ To also run the doctests within docstrings, run::
 Tests can be run under different Python versions using tox. E.g. (assuming you have the
 corresponding Python interpreters installed on your system)::
 
-    $ tox -e py27,py34,py35,py36
+    $ tox -e py27,py35,py36
 
-NumCodecs currently supports Python 2.7 and Python 3.4-3.6, so the above command must
+NumCodecs currently supports Python 2.7 and Python 3.5-3.6, so the above command must
 succeed before code can be accepted into the main code base. Note that only the py36
 tox environment runs the doctests, i.e., doctests only need to succeed under Python 3.6.
 

docs/release.rst

@@ -18,6 +18,8 @@ Release notes
 * Updated the msgpack dependency (by :user:`Jerome Kelleher <jeromekelleher>`;
   :issue:`74`, :issue:`75`).
 
+* Drop Python 3.4 (by :user:`John Kirkham <jakirkham>`; :issue:`89`).
+
 * Add codec :class:`GZip` to replace ``gzip`` alias for ``zlib``.
 
 .. _release_0.5.5: