From 5c9f218e09ed372170533cd06511225bb4cd4e8d Mon Sep 17 00:00:00 2001 From: Hendrik Schreiber Date: Tue, 10 Nov 2020 14:31:23 +0100 Subject: [PATCH 1/7] Moved to 0.0.7.dev0. --- CHANGES.rst | 3 +++ tempocnn/version.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 63b9b96..57acbf7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,9 @@ Changes ======= +0.0.7: + + 0.0.6: - Require h5py<3.0.0, to avoid model loading issues. diff --git a/tempocnn/version.py b/tempocnn/version.py index c565d3f..2fcf079 100644 --- a/tempocnn/version.py +++ b/tempocnn/version.py @@ -1 +1 @@ -__version__ = "0.0.6.dev0" +__version__ = "0.0.7.dev0" From dc1654e202d2c8af1eab3a345d55dcd1f228a44e Mon Sep 17 00:00:00 2001 From: Hendrik Schreiber Date: Tue, 10 Nov 2020 21:01:28 +0100 Subject: [PATCH 2/7] Added DOIs to bibtex entries. Added README DOI badge for SMC paper. --- CHANGES.rst | 3 ++- README.rst | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 57acbf7..1aa1602 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,7 +3,8 @@ Changes ======= 0.0.7: - + - Added DOIs to bibtex entries. + - Added README DOI badge for SMC paper. 0.0.6: - Require h5py<3.0.0, to avoid model loading issues. diff --git a/README.rst b/README.rst index c7391fc..b23dcad 100644 --- a/README.rst +++ b/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 From 43ca2916609d6bcb80bc41a52201498135d456d7 Mon Sep 17 00:00:00 2001 From: Hendrik Schreiber Date: Thu, 1 Aug 2024 16:19:39 +0200 Subject: [PATCH 3/7] Fixed dependencies. --- CHANGES.rst | 3 +++ requirements.txt | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1aa1602..2036d11 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ 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. diff --git a/requirements.txt b/requirements.txt index 2e7d562..973278c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,9 @@ tensorflow==1.15.4 -scipy>=1.0.1 +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>=65.5.1 + From 4790bb92a479f90ae74bd55952db257f1f6ad5b3 Mon Sep 17 00:00:00 2001 From: Hendrik Schreiber Date: Thu, 1 Aug 2024 16:22:16 +0200 Subject: [PATCH 4/7] Updated GH actions. --- .github/workflows/python-package.yml | 8 ++++---- .github/workflows/python-publish.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9646d42..5e35612 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -22,9 +22,9 @@ jobs: 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 diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 6940cde..f4669fa 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -13,11 +13,11 @@ jobs: runs-on: ubuntu-latest 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 From e91e492f763c817d9f1707d11629e0b41b9bba2d Mon Sep 17 00:00:00 2001 From: Hendrik Schreiber Date: Thu, 1 Aug 2024 16:22:53 +0200 Subject: [PATCH 5/7] tensorflow==1.15.5 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 973278c..1731687 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -tensorflow==1.15.4 +tensorflow==1.15.5 protobuf<3.19.0 scipy>=1.5.3 librosa>=0.6.2 From f107aafe06c3baf98a5e31d23837e466e189844a Mon Sep 17 00:00:00 2001 From: Hendrik Schreiber Date: Thu, 1 Aug 2024 16:27:52 +0200 Subject: [PATCH 6/7] Attempt build on ubuntu 20. --- .github/workflows/python-package.yml | 2 +- .github/workflows/python-publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 5e35612..8c16764 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,7 +16,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: python-version: [ 3.6, 3.7 ] diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index f4669fa..f2a7e64 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -10,7 +10,7 @@ on: jobs: deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 From 8f780816c62766ccbd77a7cf52d04bc5ac15e088 Mon Sep 17 00:00:00 2001 From: Hendrik Schreiber Date: Thu, 1 Aug 2024 16:32:15 +0200 Subject: [PATCH 7/7] setuptools 59.6.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1731687..03a9d2d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ librosa>=0.6.2 jams>=0.3.1 matplotlib>=3.0.0 h5py>=2.7.0,<3.0.0 -setuptools>=65.5.1 +setuptools>=59.6.0