Merge branch 'refs/heads/dev'

# Conflicts:
#	tempocnn/version.py

.github/workflows/python-package.yml

@@ -16,15 +16,15 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: [ 3.6, 3.7 ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -46,14 +46,14 @@ jobs:
           coverage report -m
           coverage xml -o coverage${{ matrix.python-version }}.xml
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: pytest-results-${{ matrix.python-version }}
           path: pytest_report${{ matrix.python-version }}.xml
         # Use always() to always run this step to publish test results when there are test failures
         if: ${{ always() }}
       - name: Upload coverageresults
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-${{ matrix.python-version }}
           path: coverage${{ matrix.python-version }}.xml

.github/workflows/python-publish.yml

@@ -10,14 +10,14 @@ on:
 jobs:
   deploy:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.6'
+        python-version: '3.7'
     - name: Install dependencies
       run: |
         sudo apt-get install libsndfile1

CHANGES.rst

@@ -2,6 +2,13 @@
 Changes
 =======
 
+0.0.7:
+ - Added DOIs to bibtex entries.
+ - Added README DOI badge for SMC paper.
+ - Moved to TensorFlow 1.15.5.
+ - Added appropriate protobuf dependency.
+ - Moved to scipy 1.5.3.
+
 0.0.6:
  - Require h5py<3.0.0, to avoid model loading issues.
 

README.rst

@@ -7,6 +7,9 @@
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3553592.svg
    :target: https://doi.org/10.5281/zenodo.3553592
 
+.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3249250.svg
+   :target: https://doi.org/10.5281/zenodo.3249250
+
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.4245546.svg
    :target: https://doi.org/10.5281/zenodo.4245546
 
@@ -278,7 +281,9 @@ ShallowTemp, DeepTemp, and DeepSquare models:
       Booktitle = {Proceedings of the Sound and Music Computing Conference ({SMC})},
       Pages = {47--54},
       Year = {2019},
-      Address = {M{\'a}laga, Spain}
+      Address = {M{\'a}laga, Spain},
+      doi = {10.5281/zenodo.3249250},
+      url = {https://doi.org/10.5281/zenodo.3249250}
    }
 
 Mazurka models:
@@ -291,7 +296,9 @@ Mazurka models:
       Booktitle = {Proceedings of the 21th International Society for Music Information Retrieval Conference ({ISMIR})},
       Pages = {773--779},
       Year = {2020},
-      Address = {Montreal, QC, Canada}
+      Address = {Montreal, QC, Canada},
+      doi = {10.5281/zenodo.4245546},
+      url = {https://doi.org/10.5281/zenodo.4245546}
    }
 
 References

requirements.txt

@@ -1,7 +1,9 @@
-tensorflow==1.15.4
-scipy>=1.0.1
+tensorflow==1.15.5
+protobuf<3.19.0
+scipy>=1.5.3
 librosa>=0.6.2
 jams>=0.3.1
 matplotlib>=3.0.0
 h5py>=2.7.0,<3.0.0
-setuptools>=41.0.0
+setuptools>=59.6.0
+

tempocnn/version.py

@@ -1 +1 @@
-__version__ = "0.0.6"
+__version__ = "0.0.7"