Merge upstream and finalise

Author: pbranson

.github/workflows/ci-osx.yaml

@@ -38,7 +38,8 @@ jobs:
         run: |
           conda activate env
           export CC=clang
-          python setup.py build
+          python -m pip install -U pip -r requirements_test.txt -r requirements.txt
+          python -m pip install -v -e .
 
       - name: Run tests
         shell: "bash -l {0}"

.github/workflows/ci-windows.yaml

@@ -38,7 +38,8 @@ jobs:
         run: |
           conda activate env
           export CC=clang
-          python setup.py build
+          python -m pip install -U pip -r requirements_test.txt -r requirements.txt
+          python -m pip install -v -e .
 
       - name: Run tests
         shell: "bash -l {0}"

docs/release.rst

@@ -1,23 +1,28 @@
 Release notes
 =============
 
-.. _release_0.7.4:
+.. _unreleased:
 
-0.7.4
------
+Unreleased
+----------
 
 * Add support for Python 3.9 and Update GitHub Actions.
 
 * Add support for byte Shuffle filter
   By :user:`Paul Branson <pbranson>` and :user:`Martin Durant <mdurant>` :issue:`273`.
 
+* Update Windows + Mac CI to run all tests.
+  By :user:`Jackson Maxfield Brown <JacksonMaxfield>`, :issue:`276`.
+  Help from :user:`Oleg Höfling <hoefling>`, :issue:`273`.
+>>>>>>> upstream/master
+
 .. _release_0.7.3:
 
 0.7.3
 -----
 
 * Add support for Python 3.9 and Update GitHub Actions.
-  By :user:`Jackson Maxfield <JacksonMaxfield>`, :issue:`270`.
+  By :user:`Jackson Maxfield Brown <JacksonMaxfield>`, :issue:`270`.
 
 * Remove support for Python 3.5 which is end of life. While the code base might
   still be compatible; the source dist and wheel are marked as Python 3.6+ and

numcodecs/__init__.py

@@ -92,12 +92,8 @@
 from numcodecs.base64 import Base64
 register_codec(Base64)
 
-try:
-    from numcodecs import shuffle
-    from numcodecs.shuffle import Shuffle
-    register_codec(Shuffle)
-except ImportError:  # pragma: no cover
-    pass
+from numcodecs.shuffle import Shuffle
+register_codec(Shuffle)
 
 try:
     from numcodecs.msgpacks import MsgPack