public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/audioread/, dev-python/audioread/files/
@ 2019-12-07 22:53 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-12-07 22:53 UTC (permalink / raw
  To: gentoo-commits

commit:     58157d700c9dc248693f5b3c4c529132184df6cf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 17:25:47 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 22:51:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58157d70

dev-python/audioread: 2.1.8 version bump

Package-Manager: Portage-2.3.81, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/audioread/Manifest                      |  1 +
 dev-python/audioread/audioread-2.1.8.ebuild        | 48 ++++++++++++++++++++++
 .../files/audioread-2.1.8-test-deps.patch          | 27 ++++++++++++
 3 files changed, 76 insertions(+)

diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
index 7608b16acbb..8c6fae0cf09 100644
--- a/dev-python/audioread/Manifest
+++ b/dev-python/audioread/Manifest
@@ -1 +1,2 @@
 DIST audioread-1.0.1.tar.gz 13004 BLAKE2B e2741e43904ab3eba821118163d019bc336fafc157c0a5ab7ccf09c2622d395da104232d5276fda32cd7e945a4b66279ee028bde502e2359fa58c210b5af7804 SHA512 18e9e696785fe2f1b1d6ad7fe64e2878bf490d72aef7500998bb48b0733b382cf0b171d26c5b1465947de1d5f6ded25e2b57947402c31a440e8f346722fdc533
+DIST audioread-2.1.8.tar.gz 21222 BLAKE2B 78cc55d45dd987fbe0171cd3da9f8441e38b60fa6f1b0ef8b0781abc91e6b447b8cf839437b59bfafdf13ca90bb50a032788e0470250f303122a46ddc24ebd19 SHA512 9db5ad1f8b2047256b5f6b4bbee2366043ed19d35ffd2766ae3ab66bdc5b9f63910bcf449fd42aab074fd8132642bf730c432aa0c8f3c5368cd6ef36d7f4f5a5

diff --git a/dev-python/audioread/audioread-2.1.8.ebuild b/dev-python/audioread/audioread-2.1.8.ebuild
new file mode 100644
index 00000000000..f21eb33892d
--- /dev/null
+++ b/dev-python/audioread/audioread-2.1.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Wrapper for audio file decoding using FFmpeg or GStreamer"
+HOMEPAGE="https://pypi.org/project/audioread/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	|| (
+		(
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			media-libs/gstreamer:1.0
+			media-plugins/gst-plugins-meta:1.0
+		)
+		virtual/ffmpeg
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-test-deps.patch" ) # git master
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e "/'pytest-runner'/d" -i setup.py || die
+}
+
+pkg_postinst() {
+	einfo "You may need to emerge additional GStreamer plugins or enable"
+	einfo "additional USE flags in media-video/ffmpeg to decode some types"
+	einfo "of audio files."
+}

diff --git a/dev-python/audioread/files/audioread-2.1.8-test-deps.patch b/dev-python/audioread/files/audioread-2.1.8-test-deps.patch
new file mode 100644
index 00000000000..0a67767070b
--- /dev/null
+++ b/dev-python/audioread/files/audioread-2.1.8-test-deps.patch
@@ -0,0 +1,27 @@
+From 5dd6c87a53f3a6c5bfa6ea384598213c49402056 Mon Sep 17 00:00:00 2001
+From: Glen Baker <iepathos@gmail.com>
+Date: Mon, 5 Aug 2019 23:40:27 -0700
+Subject: [PATCH] Correct pytest-runner location in setup.py
+
+Moved pytest-runner from setup_requires to tests_require.  It is the tests that require pytest-runner.
+---
+ setup.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index bd90605..6041f6e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,11 +36,8 @@ def _read(fn):
+ 
+       packages=['audioread'],
+ 
+-      setup_requires=[
+-          'pytest-runner'
+-      ],
+-
+       tests_require=[
++          'pytest-runner',
+           'pytest'
+       ],
+ 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/audioread/, dev-python/audioread/files/
@ 2021-10-17  7:33 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-10-17  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     9ec1696464d7db3b653ddb71c54aa40470c270a8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 07:26:31 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 07:26:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec16964

dev-python/audioread: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/audioread/Manifest                      |  1 -
 dev-python/audioread/audioread-2.1.8-r2.ebuild     | 33 ----------------------
 .../files/audioread-2.1.8-test-deps.patch          | 27 ------------------
 3 files changed, 61 deletions(-)

diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
index 14ca29568ad..23cbe4994c5 100644
--- a/dev-python/audioread/Manifest
+++ b/dev-python/audioread/Manifest
@@ -1,2 +1 @@
-DIST audioread-2.1.8.tar.gz 21222 BLAKE2B 78cc55d45dd987fbe0171cd3da9f8441e38b60fa6f1b0ef8b0781abc91e6b447b8cf839437b59bfafdf13ca90bb50a032788e0470250f303122a46ddc24ebd19 SHA512 9db5ad1f8b2047256b5f6b4bbee2366043ed19d35ffd2766ae3ab66bdc5b9f63910bcf449fd42aab074fd8132642bf730c432aa0c8f3c5368cd6ef36d7f4f5a5
 DIST audioread-2.1.9.tar.gz 377500 BLAKE2B a90d1d7531c265a8c2b7933ac0bfc00fbdf298546620fef3ccae0204fc1eedcc584bf2fdb79b1bbda81b29d03346abc236cd0234684ba3cc70642f837033ab99 SHA512 ad2260b6931cfeebb815d48221366a2a5d8095965ff18e94c5eb0809d9a1b02e650a62ad5e895b7f1e003771fa3babf56f59ce4538aca78b678566fd28327290

diff --git a/dev-python/audioread/audioread-2.1.8-r2.ebuild b/dev-python/audioread/audioread-2.1.8-r2.ebuild
deleted file mode 100644
index c0d64fd1ab2..00000000000
--- a/dev-python/audioread/audioread-2.1.8-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Wrapper for audio file decoding using FFmpeg or GStreamer"
-HOMEPAGE="https://pypi.org/project/audioread/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg gstreamer mad"
-
-RDEPEND="
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? (
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		media-libs/gstreamer:1.0
-		media-plugins/gst-plugins-meta:1.0
-	)
-	mad? ( dev-python/pymad )
-"
-
-PATCHES=( "${FILESDIR}/${P}-test-deps.patch" ) # git master
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "/'pytest-runner'/d" -i setup.py || die
-}

diff --git a/dev-python/audioread/files/audioread-2.1.8-test-deps.patch b/dev-python/audioread/files/audioread-2.1.8-test-deps.patch
deleted file mode 100644
index 0a67767070b..00000000000
--- a/dev-python/audioread/files/audioread-2.1.8-test-deps.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5dd6c87a53f3a6c5bfa6ea384598213c49402056 Mon Sep 17 00:00:00 2001
-From: Glen Baker <iepathos@gmail.com>
-Date: Mon, 5 Aug 2019 23:40:27 -0700
-Subject: [PATCH] Correct pytest-runner location in setup.py
-
-Moved pytest-runner from setup_requires to tests_require.  It is the tests that require pytest-runner.
----
- setup.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index bd90605..6041f6e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,11 +36,8 @@ def _read(fn):
- 
-       packages=['audioread'],
- 
--      setup_requires=[
--          'pytest-runner'
--      ],
--
-       tests_require=[
-+          'pytest-runner',
-           'pytest'
-       ],
- 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/audioread/, dev-python/audioread/files/
@ 2025-05-31 23:55 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-05-31 23:55 UTC (permalink / raw
  To: gentoo-commits

commit:     107db5597a88cf65412bcce5596add78ab47e4d7
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sat May 31 22:36:27 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 31 23:53:11 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107db559

dev-python/audioread: enable py3.13

Use unmerged PR that makes aifc and sunau optional, and use separately
maintained audioop-lts package.

Bug: https://bugs.gentoo.org/952317
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42378
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/audioread/audioread-3.0.1-r1.ebuild     |  48 +++++
 ...dioread-3.0.1-optional-deprecated-modules.patch | 208 +++++++++++++++++++++
 2 files changed, 256 insertions(+)

diff --git a/dev-python/audioread/audioread-3.0.1-r1.ebuild b/dev-python/audioread/audioread-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..0f2d5c034338
--- /dev/null
+++ b/dev-python/audioread/audioread-3.0.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Wrapper for audio file decoding using FFmpeg or GStreamer"
+HOMEPAGE="
+	https://github.com/beetbox/audioread/
+	https://pypi.org/project/audioread/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ffmpeg gstreamer mad"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/audioop-lts[${PYTHON_USEDEP}]
+	' python3_13)
+	ffmpeg? (
+		media-video/ffmpeg
+	)
+	gstreamer? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		media-libs/gstreamer:1.0
+		media-plugins/gst-plugins-meta:1.0
+	)
+	mad? (
+		dev-python/pymad[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pymad[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/audioread-3.0.1-optional-deprecated-modules.patch
+)

diff --git a/dev-python/audioread/files/audioread-3.0.1-optional-deprecated-modules.patch b/dev-python/audioread/files/audioread-3.0.1-optional-deprecated-modules.patch
new file mode 100644
index 000000000000..ee65344c8e9f
--- /dev/null
+++ b/dev-python/audioread/files/audioread-3.0.1-optional-deprecated-modules.patch
@@ -0,0 +1,208 @@
+https://bugs.gentoo.org/952317
+https://github.com/beetbox/audioread/issues/144
+https://github.com/beetbox/audioread/pull/148
+
+(Cherrypicked)
+
+From 1ddd63b3ba6bcb11ef993c7da18db0fc83af84b7 Mon Sep 17 00:00:00 2001
+From: Brian McFee <brian.mcfee@nyu.edu>
+Date: Wed, 29 Jan 2025 12:51:27 -0500
+Subject: [PATCH 1/4] implemented flexible legacy codec handling
+
+--- a/audioread/rawread.py
++++ b/audioread/rawread.py
+@@ -13,11 +13,10 @@
+ # included in all copies or substantial portions of the Software.
+ 
+ """Uses standard-library modules to read AIFF, AIFF-C, and WAV files."""
+-import aifc
+ import audioop
+ import struct
+-import sunau
+ import wave
++import warnings
+ 
+ from .exceptions import DecodeError
+ from .base import AudioFile
+@@ -54,20 +53,13 @@ def byteswap(s):
+ class RawAudioFile(AudioFile):
+     """An AIFF, WAV, or Au file that can be read by the Python standard
+     library modules ``wave``, ``aifc``, and ``sunau``.
++
++    On Python 3.13 and later, ``aifc`` and ``sunau`` support require
++    installing the ``standard-aifc`` and ``standard-sunau`` packages, respectively.
+     """
+     def __init__(self, filename):
+         self._fh = open(filename, 'rb')
+ 
+-        try:
+-            self._file = aifc.open(self._fh)
+-        except aifc.Error:
+-            # Return to the beginning of the file to try the next reader.
+-            self._fh.seek(0)
+-        else:
+-            self._needs_byteswap = True
+-            self._check()
+-            return
+-
+         try:
+             self._file = wave.open(self._fh)
+         except wave.Error:
+@@ -78,15 +70,38 @@ class RawAudioFile(AudioFile):
+             self._check()
+             return
+ 
++        # The following are deprecated formats and may not be supported
+         try:
+-            self._file = sunau.open(self._fh)
+-        except sunau.Error:
+-            self._fh.seek(0)
+-            pass
++            import aifc
++        except ImportError:
++            warnings.warn("aifc module not found; AIFF files will not be supported. "
++                          "You may need to install the standard-aifc package.")
+         else:
+-            self._needs_byteswap = True
+-            self._check()
+-            return
++            try:
++                self._file = aifc.open(self._fh)
++            except aifc.Error:
++                # Return to the beginning of the file to try the next reader.
++                self._fh.seek(0)
++            else:
++                self._needs_byteswap = True
++                self._check()
++                return
++
++        try:
++            import sunau
++        except ImportError:
++            warnings.warn("sunau module not found; Au files will not be supported. "
++                          "You may need to install the standard-sunau package.")
++        else:
++            try:
++                self._file = sunau.open(self._fh)
++            except sunau.Error:
++                self._fh.seek(0)
++                pass
++            else:
++                self._needs_byteswap = True
++                self._check()
++                return
+ 
+         # None of the three libraries could open the file.
+         self._fh.close()
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -8,7 +8,7 @@ authors = [
+     {name = "Adrian Sampson", email = "adrian@radbox.org"}
+ ]
+ readme = "README.rst"
+-requires-python = ">=3.6"
++requires-python = ">=3.8"
+ dynamic = ["version", "description"]
+ urls.Home = "https://github.com/beetbox/audioread"
+ classifiers = [
+@@ -19,9 +19,15 @@ classifiers = [
+     'Programming Language :: Python :: 3.9',
+     'Programming Language :: Python :: 3.10',
+     'Programming Language :: Python :: 3.11',
++    'Programming Language :: Python :: 3.12',
++    'Programming Language :: Python :: 3.13',
+ ]
+ 
+ [project.optional-dependencies]
+ test = [
+     "tox"
+ ]
++legacy = [
++    "standard-aifc; python_version >= '3.13'",
++    "standard-sunau; python_version >= '3.13'"
++]
+-- 
+2.49.0
+
+
+From d761d0c9df6ca423aa7e69c27d0946c1d9c7b5d3 Mon Sep 17 00:00:00 2001
+From: Brian McFee <brian.mcfee@nyu.edu>
+Date: Mon, 3 Feb 2025 12:17:55 -0500
+Subject: [PATCH 2/4] added audioop-lts dependency for modern python installs
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -9,6 +9,9 @@ authors = [
+ ]
+ readme = "README.rst"
+ requires-python = ">=3.8"
++requires = [
++    "audioop-lts; python_version >= '3.13'"
++]
+ dynamic = ["version", "description"]
+ urls.Home = "https://github.com/beetbox/audioread"
+ classifiers = [
+-- 
+2.49.0
+
+
+From a7d86b7c2a22489a58d0ff9dc3e0b7608aa25914 Mon Sep 17 00:00:00 2001
+From: Brian McFee <brian.mcfee@nyu.edu>
+Date: Mon, 3 Feb 2025 12:29:58 -0500
+Subject: [PATCH 3/4] updated readme
+
+--- a/README.rst
++++ b/README.rst
+@@ -8,8 +8,8 @@ currently supports:
+ - `Core Audio`_ on Mac OS X via `ctypes`_. (PyObjC not required.)
+ - `MAD`_ via the `pymad`_ bindings.
+ - `FFmpeg`_ or `Libav`_ via its command-line interface.
+-- The standard library `wave`_, `aifc`_, and `sunau`_ modules (for
+-  uncompressed audio formats).
++- The standard library `wave`_ module (for
++  uncompressed audio formats).  Legacy formats `aifc`_ and `sunau`_ are also optionally supported, see the note below.
+ 
+ .. _Gstreamer: http://gstreamer.freedesktop.org/
+ .. _gst-python: http://gstreamer.freedesktop.org/modules/gst-python.html
+@@ -73,6 +73,18 @@ that you have a broken installation of `FFmpeg`_. To check, try typing
+ FFmpeg with your OS's package manager (e.g., apt or yum) or `using Conda
+ <https://anaconda.org/conda-forge/ffmpeg>`_.
+ 
++Legacy formats
++--------------
++The `aifc`_ and `sunau`_ modules were deprecated and removed from the standard
++Python distribution in version 3.13.
++Support for `aifc` and `sunau` formats is still available through `deadlib`_.
++To install audioread with continued support for these formats, you can
++use the following command::
++
++    python -m pip install audioread[legacy]
++
++.. _deadlib: https://github.com/youknowone/python-deadlib
++
+ Version History
+ ---------------
+ 
+-- 
+2.49.0
+
+
+From 7f932069d2e44e97d2da7d243f067d3726a0db8d Mon Sep 17 00:00:00 2001
+From: Brian McFee <brian.mcfee@nyu.edu>
+Date: Mon, 3 Feb 2025 14:14:15 -0500
+Subject: [PATCH 4/4] fixed wrong format spec for dependencies
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -9,7 +9,7 @@ authors = [
+ ]
+ readme = "README.rst"
+ requires-python = ">=3.8"
+-requires = [
++dependencies = [
+     "audioop-lts; python_version >= '3.13'"
+ ]
+ dynamic = ["version", "description"]
+-- 
+2.49.0
+


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-05-31 23:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-31 23:55 [gentoo-commits] repo/gentoo:master commit in: dev-python/audioread/, dev-python/audioread/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2021-10-17  7:33 Michał Górny
2019-12-07 22:53 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox