Merge pull request #111 from carlthome/upgrade-dependencies

Update protobuf version, allow newer matplotlib, update GitHub Actions test workflow
descriptinc · Oct 23, 2024 · 394c849 · 394c849
2 parents 7776c29 + 6382c87
commit 394c849
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -1,4 +1,5 @@
-name: pr
+name: Test
+
 on: pull_request
 
 jobs:
@@ -8,36 +9,28 @@ jobs:
       - uses: actions/checkout@v2
       # Run isort + black formatter
       - name: Python Code Formatter
-        uses: descriptinc/python-format-action@master
+        uses: descriptinc/python-format-action@main
 
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v2
         with:
           lfs: true
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/*requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.python-version }}-pip-
-      - name: Checkout LFS objects
-        run: git lfs checkout
+          cache: pip
+          cache-dependency-path: setup.py
       - name: Install binaries
         run: |
           sudo apt-get update
-          sudo apt-get install ffmpeg
-          sudo apt-get install libsndfile1-dev libsox-dev libsox-fmt-mp3
+          sudo apt-get install ffmpeg libsndfile1-dev libsox-dev libsox-fmt-mp3
           python -m pip install --upgrade pip
           pip install wheel
       - name: Install recent FFMPEG

diff --git a/setup.py b/setup.py
@@ -46,16 +46,15 @@
         "ffmpy",
         "ipython",
         "rich",
-        "matplotlib==3.5",  # See https://github.com/librosa/librosa/issues/1763#issuecomment-1742120524
+        "matplotlib",
         "librosa",
         "pystoi",
         "torch_stoi",
         "flatten-dict",
         "markdown2",
         "randomname",
-        # Have to freeze protobuf version, https://github.com/protocolbuffers/protobuf/issues/10051
-        # Borrowing pin from tensorboard source: https://github.com/tensorflow/tensorboard/commit/fd4f5ff79374252e313c2e7e9b247bc49ab0d54d.
-        "protobuf >= 3.9.2, < 3.20",
+        # Borrowing pin from tensorboard source: https://github.com/tensorflow/tensorboard/commit/e795312f70537cb9c9ab4bd2a08a03e77f0356a5.
+        "protobuf >= 3.19.6, != 4.24.0, < 5.0.0",
         "tensorboard",
         "tqdm",
     ],