Merge branch 'dev' into main

hendriks73 · Nov 10, 2020 · 601c133 · 601c133
2 parents 873b5fa + b47797d
commit 601c133
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -31,7 +31,7 @@ jobs:
         run: |
           sudo apt-get install libsndfile1
           sudo apt-get install ffmpeg
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade pip setuptools wheel
           pip install flake8 pytest
           pip install .[testing]
       - name: Lint with flake8

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,6 +2,9 @@
 Changes
 =======
 
+0.0.6:
+ - Require h5py<3.0.0, to avoid model loading issues.
+
 0.0.5:
  - Moved to TensorFlow 1.15.4.
  - Consolidated version info.

diff --git a/requirements.txt b/requirements.txt
@@ -3,5 +3,5 @@ scipy>=1.0.1
 librosa>=0.6.2
 jams>=0.3.1
 matplotlib>=3.0.0
-h5py>=2.7.0
+h5py>=2.7.0,<3.0.0
 setuptools>=41.0.0
diff --git a/tempocnn/version.py b/tempocnn/version.py
@@ -1 +1 @@
-__version__ = "0.0.5"
+__version__ = "0.0.6.dev0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,9 @@ @@
     Changes
     =======
+.0.6:
+     - Require h5py<3.0.0, to avoid model loading issues.
 .0.5:
      - Moved to TensorFlow 1.15.4.
      - Consolidated version info.
@@ Expand Down @@