From 0c2a1328abddb541bb5129d77d04c723863d93d1 Mon Sep 17 00:00:00 2001
From: Albert Villanova del Moral
 <8515462+albertvillanova@users.noreply.github.com>
Date: Mon, 27 May 2024 10:43:44 +0200
Subject: [PATCH] Remove torchaudio remnants from code

---
 src/datasets/packaged_modules/audiofolder/audiofolder.py | 4 ++--
 src/datasets/packaged_modules/webdataset/webdataset.py   | 2 +-
 tests/conftest.py                                        | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/datasets/packaged_modules/audiofolder/audiofolder.py b/src/datasets/packaged_modules/audiofolder/audiofolder.py
index 51044143039..02f9313cf9a 100644
--- a/src/datasets/packaged_modules/audiofolder/audiofolder.py
+++ b/src/datasets/packaged_modules/audiofolder/audiofolder.py
@@ -30,8 +30,8 @@ class AudioFolder(folder_based_builder.FolderBasedBuilder):
 #
 # AUDIO_EXTENSIONS = [f".{format.lower()}" for format in sf.available_formats().keys()]
 #
-# # .mp3 is currently decoded via `torchaudio`, .opus decoding is supported if version of `libsndfile` >= 1.0.30:
-# AUDIO_EXTENSIONS.extend([".mp3", ".opus"])
+# # .opus decoding is supported if libsndfile >= 1.0.31:
+# AUDIO_EXTENSIONS.extend([".opus"])
 # ```
 # We intentionally do not run this code on launch because:
 # (1) Soundfile is an optional dependency, so importing it in global namespace is not allowed
diff --git a/src/datasets/packaged_modules/webdataset/webdataset.py b/src/datasets/packaged_modules/webdataset/webdataset.py
index 5b21a729dfd..a9e203cc3a2 100644
--- a/src/datasets/packaged_modules/webdataset/webdataset.py
+++ b/src/datasets/packaged_modules/webdataset/webdataset.py
@@ -185,7 +185,7 @@ def _generate_examples(self, tar_paths, tar_iterators):
 #
 # AUDIO_EXTENSIONS = [f".{format.lower()}" for format in sf.available_formats().keys()]
 #
-# # .mp3 is currently decoded via `torchaudio`, .opus decoding is supported if version of `libsndfile` >= 1.0.30:
+# # .opus decoding is supported if libsndfile >= 1.0.31:
 # AUDIO_EXTENSIONS.extend([".mp3", ".opus"])
 # ```
 # We intentionally do not run this code on launch because:
diff --git a/tests/conftest.py b/tests/conftest.py
index c6770ddac8c..eeec9e7111c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -16,10 +16,6 @@ def pytest_collection_modifyitems(config, items):
         item.add_marker(pytest.mark.unit)
 
 
-def pytest_configure(config):
-    config.addinivalue_line("markers", "torchaudio_latest: mark test to run with torchaudio>=0.12")
-
-
 @pytest.fixture(autouse=True)
 def set_test_cache_config(tmp_path_factory, monkeypatch):
     # test_hf_cache_home = tmp_path_factory.mktemp("cache")  # TODO: why a cache dir per test function does not work?