csoundengine 2.23.0__tar.gz → 2.24.0__tar.gz

{csoundengine-2.23.0 → csoundengine-2.24.0}/.github/workflows/test2.yml

@@ -169,3 +169,41 @@ jobs:
         with:
           name: artifact-csound7-${{ matrix.os }}-${{ matrix.python-version }}-${{ strategy.job-index }}
           path: test/*.wav
+
+  testdeps:
+    name: Check that all dependencies are installed without a system csound
+    # csound is not preinstalled on these runners. Importing libcsound (which
+    # happens when importing csoundengine) is expected to install csound and
+    # its plugins on demand.
+    # ubuntu-latest -> linux x86_64, macos-latest -> macos arm64
+    # (intentionally not linux-arm64 nor windows, where this is not supported)
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "macos-latest"]
+        python-version: ["3.12", "3.13"]
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: check that csound is not preinstalled
+        run: |
+          if command -v csound; then
+            echo "ERROR: this test expects csound to not be installed beforehand"
+            exit 1
+          fi
+          echo "csound is not preinstalled, good"
+
+      - name: install csoundengine (csound is not installed on purpose)
+        run: |
+          pip install .
+
+      - name: check that all dependencies (csound, plugins) get installed
+        run: |
+          cd test
+          python testdeps.py

{csoundengine-2.23.0 → csoundengine-2.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csoundengine
-Version: 2.23.0
+Version: 2.24.0
 Summary: An audio synthesis framework using csound
 Author-email: Eduardo Moguillansky <eduardo.moguillansky@gmail.com>
 License: GNU GENERAL PUBLIC LICENSE
@@ -680,7 +680,7 @@ License: GNU GENERAL PUBLIC LICENSE
 Project-URL: Homepage, https://github.com/gesellkammer/csoundengine
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: numpy
@@ -695,12 +695,12 @@ Requires-Dist: ipywidgets
 Requires-Dist: xxhash
 Requires-Dist: docstring_parser
 Requires-Dist: typing_extensions
-Requires-Dist: libcsound>=0.16.1
+Requires-Dist: libcsound>=0.17.1
 Requires-Dist: sndfileio>=2.1.1
 Requires-Dist: emlib>=1.20
 Requires-Dist: configdict>=2.10.0
 Requires-Dist: pitchtools>=1.14.0
-Requires-Dist: risset>=3.2.2
+Requires-Dist: risset>=3.5.7
 Requires-Dist: sounddevice
 Dynamic: license-file
 
@@ -885,8 +885,13 @@ https://csoundengine.readthedocs.io/en/latest/Installation.html
 Dependencies
 ~~~~~~~~~~~~
 
-* python >= 3.9
-* csound 6 >= 6.17 (https://github.com/csound/csound/releases). Csound 7 is supported and recommended
+* python >= 3.12
+* csound 7 >= 7.0 (csound 6 is supported but it is declared EOL)
+
+.. note::
+    csound only needs to be installed previously on windows at the moment, for
+    the other platforms it is installed automatically if not present
+
 
 .. code-block:: bash
 

{csoundengine-2.23.0 → csoundengine-2.24.0}/README.rst

@@ -179,8 +179,13 @@ https://csoundengine.readthedocs.io/en/latest/Installation.html
 Dependencies
 ~~~~~~~~~~~~
 
-* python >= 3.9
-* csound 6 >= 6.17 (https://github.com/csound/csound/releases). Csound 7 is supported and recommended
+* python >= 3.12
+* csound 7 >= 7.0 (csound 6 is supported but it is declared EOL)
+
+.. note::
+    csound only needs to be installed previously on windows at the moment, for
+    the other platforms it is installed automatically if not present
+
 
 .. code-block:: bash
 

{csoundengine-2.23.0 → csoundengine-2.24.0}/csoundengine/csoundlib.py

@@ -39,12 +39,6 @@ if TYPE_CHECKING:
 logger = _logging.getLogger("csoundengine")
 
 
-_cache: dict[str, Any] = {
-    'opcodes': None,
-    'versionTriplet': None
-}
-
-
 _audioDeviceRegex = r"(\d+):\s((?:adc|dac)\d+)\s*\((.*)\)(?:\s+\[ch:(\d+)\])?"
 
 
@@ -401,6 +395,8 @@ class _AlsaBackend(AudioBackend):
 
 @_functools.cache
 def _getAvailableAudioBackends() -> dict[str, AudioBackend]:
+    # This is not correct, we should actually check which plugins
+    # are available
     _backendPortaudioCallback = _PortaudioBackend('callback')
 
     backends: dict[str, AudioBackend] = {
@@ -414,7 +410,6 @@ def _getAvailableAudioBackends() -> dict[str, AudioBackend]:
 
     if sys.platform == 'linux':
         backends['alsa'] = _AlsaBackend()
-        backends['pulseaudio'] = _PulseAudioBackend()
     elif sys.platform == 'darwin':
         auhal = AudioBackend('auhal', alwaysAvailable=True, hasSystemSr=True,
                              needsRealtime=False, longname="coreaudio",
@@ -439,17 +434,7 @@ def findCsound() -> str | None:
     return csound
 
 
-def _getVersionViaApi() -> tuple[int, int, int]:
-    """
-    Returns the csound version as tuple (major, minor, patch)
-    """
-    if (version := _cache.get('versionTriplet')) is not None:
-        return version
-    return _csoundGetInfoViaAPI()['versionTriplet']
-
-
-@_functools.cache
-def getVersion(useApi=True) -> tuple[int, int, int | str]:
+def getVersion(opcodedir='') -> tuple[int, int, int | str]:
     """
     Returns the csound version as tuple (major, minor, patch)
 
@@ -464,34 +449,7 @@ def getVersion(useApi=True) -> tuple[int, int, int | str]:
     Raises RuntimeError if csound is not present or its version
     can't be parsed
     """
-    if useApi:
-        return _getVersionViaApi()
-
-    csound = findCsound()
-    if not csound:
-        raise IOError("Csound not found")
-    cmd = '{csound} --version'.format(csound=csound).split()
-    proc = _subprocess.Popen(cmd, stderr=_subprocess.PIPE)
-    proc.wait()
-    if proc.stderr is None:
-        return (0, 0, 0)
-    outputbytes = proc.stderr.read()
-    if not outputbytes:
-        raise RuntimeError("Could not read csounds output")
-    output = outputbytes.decode('utf8')
-    lines = output.splitlines()
-    for line in lines:
-        if match := _re.search(r"Csound\s+version\s+(\d+)\.(\d+)(\.\w+)?", line):
-            major = int(match.group(1))
-            minor = int(match.group(2))
-            patch = match.group(3)
-            if patch is None:
-                patch = 0
-            elif patch.isdigit():
-                patch = int(patch)
-            return (major, minor, patch)
-    else:
-        raise RuntimeError(f"Did not find a csound version, csound output: '{output}'")
+    return csoundGetInfo(opcodedir=opcodedir)['versionTriplet']
 
 
 def csoundSubproc(args: list[str], piped=True, wait=False) -> _subprocess.Popen:
@@ -558,28 +516,6 @@ def getSystemSr(backend: str) -> float | None:
     return b.getSystemSr()
 
 
-# def _getJackSrViaClient() -> float:
-#     import jack
-#     c = jack.Client("query")
-#     sr = c.samplerate
-#     c.close()
-#     return sr
-
-
-# def _getCsoundSystemSr(backend: str) -> float:
-#     if backend not in {'jack', 'auhal'}:
-#         raise ValueError(f"backend {backend} does not support system sr")
-#     import libcsound
-#     csound = libcsound.Csound()
-#     csound.setOption(f"-+rtaudio={backend}")
-#     csound.setOption("-odac")
-#     csound.setOption("--use-system-sr")
-#     csound.start()
-#     sr = csound.sr()
-#     csound.stop()
-#     return sr
-
-
 def getDefaultBackend() -> AudioBackend:
     """
     Get the default active backend for platform
@@ -717,9 +653,9 @@ class CsoundProc:
     csdstr: str = ""
 
 
-def testCsound(dur=8., nchnls=2, backend='', device="dac", sr=0, ksmps=64,
-               verbose=True
-               ) -> CsoundProc:
+def testCsound(dur=8., nchnls=2, backend='', device="", sr=0, ksmps=64,
+               opcodeDir='', verbose=True, options: list[str] | None = None
+               ) -> None:
     """
     Test the current csound installation for realtime output
 
@@ -732,37 +668,14 @@ def testCsound(dur=8., nchnls=2, backend='', device="dac", sr=0, ksmps=64,
             or a default sample rate otherwise
         verbose: if True, make csound display debugging and status information
 
-    Returns:
-        a :class:`CsoundProc`
     """
     backend = backend or getDefaultBackend().name
     if not sr:
         sr = getSamplerateForBackend(backend) or 44100
-    printchan = "printk2 kchn" if verbose else ""
-    orc = f"""
-sr = {sr}
-ksmps = {ksmps}
-nchnls = {nchnls}
-
-instr 1
-    iperiod = 1
-    kchn init -1
-    ktrig metro 1/iperiod
-    kchn = (kchn + ktrig) % nchnls
-    anoise pinker
-    outch kchn+1, anoise
-    {printchan}
-endin
-    """
-    sco = f"i1 0 {dur}"
-    orc = _textwrap.dedent(orc)
-    logger.debug(orc)
-    csd = joinCsd(orc, sco=sco)
-    tmp = _tempfile.mktemp(suffix=".csd")
-    open(tmp, "w").write(csd)
-    proc = runCsd(tmp, outdev=device, backend=backend)
-    return CsoundProc(proc=proc, backend=backend, outdev=device, sr=sr,
-                      nchnls=nchnls, csdstr=csd)
+    import libcsound._util
+    libcsound._util.testCsound(module=backend, sr=sr, outdev=device, ksmps=ksmps,
+                               nchnls=nchnls, dur=dur, opcodeDir=opcodeDir,
+                               options=options)
 
 
 def installedOpcodes(cached=True, opcodedir: str = '') -> set[str]:
@@ -778,15 +691,17 @@ def installedOpcodes(cached=True, opcodedir: str = '') -> set[str]:
     Returns:
         a list of all available opcodes
     """
-    if opcodedir:
-        cached = False
-    if cached and _cache.get('opcodes') is not None:
-        return _cache['opcodes']
-    return _csoundGetInfoViaAPI(opcodedir=opcodedir)['opcodes']
+    if not cached:
+        csoundGetInfo.cache_clear()
+    return csoundGetInfo(opcodedir=opcodedir)['opcodes']
+
 
+@_functools.cache
+def csoundGetInfo(opcodedir='') -> dict:
+    """
+    Returns a dict of {'opcodedefs': list[OpcodeDef], 'opcodes': set[str], 'versionTriplet': (major, minor, patch)}
 
-def _csoundGetInfoViaAPI(opcodedir='') -> dict:
-    global _cache
+    """
     import libcsound
     cs = libcsound.Csound(opcodeDir=opcodedir)
     cs.setOption("-d")
@@ -799,11 +714,9 @@ def _csoundGetInfoViaAPI(opcodedir='') -> dict:
     major = int(vs[:-3])
     versionTriplet = (major, minor, patch)
     opcodes = cs.getOpcodes()
-    opcodenames = set(opc.name for opc in opcodes)
-    _cache['versionTriplet'] = versionTriplet
-    _cache['opcodes'] = opcodenames
-    _cache['opcodedefs'] = opcodes
     cs.stop()
+    cs.destroy()
+    opcodenames = {opc.name.split(".")[0] for opc in opcodes}
     return {'opcodedefs': opcodes,
             'opcodes': opcodenames,
             'versionTriplet': versionTriplet}

{csoundengine-2.23.0 → csoundengine-2.24.0}/csoundengine/dependencies.py

@@ -10,9 +10,7 @@ import tempfile
 from datetime import datetime
 from pathlib import Path
 
-from . import tools
 from .state import state
-from . import csounddefs
 
 
 logger = logging.getLogger("csoundengine.dependencies")
@@ -151,13 +149,17 @@ def pluginsInstalled(cached=True) -> bool:
     from . import csoundlib
     installedOpcodes = csoundlib.installedOpcodes(cached=cached)
     neededOpcodes = {
-        "atstop", "pwrite", "pread", "initerror",
-        "dict_new", "dict_set", "dict_get",
-        "pool_gen", "pool_pop", "pool_push", "pool_isfull",
+        "atstop", "pwrite",
+        "dict_new", "pool_gen", "pool_pop", "pool_push",
         'interp1d', 'bisect', 'ftsetparams', 'zeroarray',
         'panstereo'
     }
-    return neededOpcodes.issubset(installedOpcodes)
+    ok = neededOpcodes.issubset(installedOpcodes)
+    if not ok:
+        notfound = neededOpcodes - installedOpcodes
+        logger.debug("Opcodes not found: %s", notfound)
+        logger.debug("Opcodes found: %s...", sorted(installedOpcodes)[:20])
+    return ok
 
 
 def _getDownloadsFolder() -> Path:
@@ -169,44 +171,6 @@ def _getDownloadsFolder() -> Path:
     return tempdir
 
 
-def _installPluginsFromDist(apiversion=6, codesign=True) -> None:
-    platformid = tools.platformId()
-    rootfolder = Path(os.path.split(__file__)[0])
-    assert rootfolder.exists()
-    globpattern = {
-        'macos': '*.dylib',
-        'windows': '*.dll',
-        'linux': '*.so'
-    }.get(platformid.osname, None)
-    if globpattern is None:
-        raise RuntimeError(f"Platform {platformid} not supported")
-
-    subfolder = str(platformid)
-    pluginspath = rootfolder/f'data/plugins{apiversion}'/subfolder
-    if not pluginspath.exists():
-        raise RuntimeError(f"Could not find own csound plugins. Folder: {pluginspath}")
-    plugins = list(pluginspath.glob(globpattern))
-    if not plugins:
-        logger.error(f"Plugins not found. Plugins folder: '{pluginspath}', "
-                     f"glob patter: '{globpattern}'")
-        raise RuntimeError("Plugins not found")
-    pluginsDest = csounddefs.userPluginsFolder(apiversion=f'{apiversion}.0')
-    logger.info(f"Installing plugins in folder: '{pluginsDest}'")
-    os.makedirs(pluginsDest, exist_ok=True)
-    _copyFiles([plugin.as_posix() for plugin in plugins], pluginsDest, verbose=True)
-    if platformid.osname == 'macos' and codesign:
-        installedBinaries = [os.path.join(pluginsDest, plugin.name)
-                             for plugin in plugins]
-        assert all(os.path.exists(binary) for binary in installedBinaries)
-        try:
-            _codesignBinaries(installedBinaries)
-        except RuntimeError as e:
-            logger.error(f"Could not code-sign the binaries, error: {e}")
-            if platformid.arch == 'arm64':
-                logger.error(f"... The needed plugins will probably not work as is. You can still "
-                             f"manually authorize them via right-click. The paths are: {installedBinaries}")
-
-
 def _installPluginsViaRisset(majorversion: int | None = None) -> bool:
     """
     Tries to install plugins via risset
@@ -215,7 +179,7 @@ def _installPluginsViaRisset(majorversion: int | None = None) -> bool:
     """
     logger.info("Trying to install plugins via risset")
     import risset
-    idx = risset.MainIndex(update=True, majorversion=majorversion)
+    idx = risset.MainIndex(update=True, major_version=majorversion or 7)
     for pluginname in ['else', 'beosc', 'klib']:
         p = idx.plugins.get(pluginname)
         if p is None:
@@ -224,10 +188,12 @@ def _installPluginsViaRisset(majorversion: int | None = None) -> bool:
         elif idx.is_plugin_installed(p):
             logger.debug(f"Plugin '{pluginname}' already installed, skipping")
         else:
+            logger.debug(f"Installing plugin {pluginname}")
             errmsg = idx.install_plugin(p)
             if errmsg:
                 logger.error(f"Error while installing plugin {pluginname}: {errmsg}")
                 return False
+    logger.debug("---- Installed all plugins")
     return True
 
 
@@ -251,36 +217,35 @@ def installPlugins() -> bool:
                                 " listed by csound")
                 from . import csoundlib
                 opcodes = csoundlib.installedOpcodes(cached=False)
-                opcodestr = ', '.join(opcodes)
-                logger.error(f"List of opcodes loaded by csound: {opcodestr}")
+                logger.error("List of opcodes loaded by csound: %s", ', '.join(sorted(opcodes)))
             return False
     except Exception as e:
         logger.error(f"Exception {e} while trying to install plugins via risset")
         return False
 
 
-def _checkDependencies(fix=False, quiet=False) -> str:
+def _checkDependencies(fix=False) -> str:
     """
     Returns an error message on failure, or an empty string on success
     """
     from . import csoundlib
-    version = csoundlib.getVersion(useApi=True)
+    info = csoundlib.csoundGetInfo()
+    version = info['versionTriplet']
 
     if version < (6, 16, 0):
         return f"Csound version ({version}) is too old, should be >= 6.16"
 
-    if version[0] >= 7:
-        logger.debug("Csound 7 support is experimental")
+    elif version < (7, 0, 0):
+        logger.info("Support for csound 6 has been deprecated, use at your own risk")
 
     if not pluginsInstalled():
         if fix:
-            print("** csoundengine: Csound external plugins are not installed or are too old."
-                  " I will try to install them now")
+            print("** csoundengine: Csound external plugins not found, installing...")
             ok = installPlugins()
             if ok:
-                print("** csoundengine: csound external plugins installed ok")
+                print("** csoundengine: ... plugins installed ok")
             else:
-                print("** csoundengine: csound external plugins could not be installed")
+                print("** csoundengine: plugins could not be installed")
                 return "csound external plugins could not be installed"
         else:
             return ("Some plugins are not installed. They can be installed via "
@@ -309,13 +274,15 @@ def installDependencies() -> bool:
     return not err
 
 
-def checkDependencies(force=True, fix=False) -> bool:
+def checkDependencies(force=True, fix=False, timeoutDays=30) -> bool:
     """
     Check that all external dependencies are fullfilled.
 
     Args:
         force: if True, do not use cached results
         fix: if True, try to fix missing dependencies if needed
+        timeoutDays: if the last check was done less than this
+            number of days ago, skip the check
 
     Returns:
         True if all dependencies are fullfilled
@@ -328,7 +295,7 @@ def checkDependencies(force=True, fix=False) -> bool:
 
     now = datetime.now()
     timeSinceLastCheck = now - datetime.fromisoformat(state['last_check'])
-    if not force and timeSinceLastCheck.days < 30:
+    if not force and timeoutDays > 0 and timeSinceLastCheck.days < timeoutDays:
         return True
     logger.info("Checking dependencies")
     errormsg = _checkDependencies(fix=fix)
@@ -337,14 +304,3 @@ def checkDependencies(force=True, fix=False) -> bool:
         if not fix:
             logger.error("Missing dependencies might be installed by calling installDependencies()")
     return not errormsg
-
-
-def _codesignBinaries(binaries: list[str]) -> None:
-    """
-    Calls codesign to sign the binaries with adhoc signature
-
-    Raises RuntimeError on fail
-    """
-    import risset
-    logger.warning(f"Codesigning macos binaries: {binaries}")
-    risset.macos_codesign(binaries, signature='-')

{csoundengine-2.23.0 → csoundengine-2.24.0}/csoundengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csoundengine
-Version: 2.23.0
+Version: 2.24.0
 Summary: An audio synthesis framework using csound
 Author-email: Eduardo Moguillansky <eduardo.moguillansky@gmail.com>
 License: GNU GENERAL PUBLIC LICENSE
@@ -680,7 +680,7 @@ License: GNU GENERAL PUBLIC LICENSE
 Project-URL: Homepage, https://github.com/gesellkammer/csoundengine
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: numpy
@@ -695,12 +695,12 @@ Requires-Dist: ipywidgets
 Requires-Dist: xxhash
 Requires-Dist: docstring_parser
 Requires-Dist: typing_extensions
-Requires-Dist: libcsound>=0.16.1
+Requires-Dist: libcsound>=0.17.1
 Requires-Dist: sndfileio>=2.1.1
 Requires-Dist: emlib>=1.20
 Requires-Dist: configdict>=2.10.0
 Requires-Dist: pitchtools>=1.14.0
-Requires-Dist: risset>=3.2.2
+Requires-Dist: risset>=3.5.7
 Requires-Dist: sounddevice
 Dynamic: license-file
 
@@ -885,8 +885,13 @@ https://csoundengine.readthedocs.io/en/latest/Installation.html
 Dependencies
 ~~~~~~~~~~~~
 
-* python >= 3.9
-* csound 6 >= 6.17 (https://github.com/csound/csound/releases). Csound 7 is supported and recommended
+* python >= 3.12
+* csound 7 >= 7.0 (csound 6 is supported but it is declared EOL)
+
+.. note::
+    csound only needs to be installed previously on windows at the moment, for
+    the other platforms it is installed automatically if not present
+
 
 .. code-block:: bash
 

{csoundengine-2.23.0 → csoundengine-2.24.0}/csoundengine.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-.cirrus.yml
 .gitignore
 LICENSE.txt
 MANIFEST.in
@@ -127,4 +126,5 @@ test/simple.py
 test/test1.csd
 test/test1.py
 test/test2.py
-test/testargs.py
+test/testargs.py
+test/testdeps.py

{csoundengine-2.23.0 → csoundengine-2.24.0}/csoundengine.egg-info/requires.txt

@@ -10,10 +10,10 @@ ipywidgets
 xxhash
 docstring_parser
 typing_extensions
-libcsound>=0.16.1
+libcsound>=0.17.1
 sndfileio>=2.1.1
 emlib>=1.20
 configdict>=2.10.0
 pitchtools>=1.14.0
-risset>=3.2.2
+risset>=3.5.7
 sounddevice

csoundengine-2.24.0/docs/Installation.rst

@@ -0,0 +1,15 @@
+Installation
+============
+
+For all platforms, the installation is the same::
+
+    pip install csoundengine
+
+    
+Dependencies
+------------
+
+on windows, **csoundengine** depends on **csound** being installed. For the other platforms
+it will be installed if it is not present. If you already have csound installed, the
+version detected will be used, but bear in mind that if using csound 7, a recent version
+is needed since the plugins used are compiled against the last development version

{csoundengine-2.23.0 → csoundengine-2.24.0}/docs/Introduction.rst

@@ -297,8 +297,9 @@ Features
   parameters and default values. This makes it very easy to create instruments with
   many parameters. When an instance of such an instrument is scheduled **csoundengine**
   fills the values of any parameter which is not explicitely given with the default
-  value. Any parg can also be modulated in real-time. See :meth:`Engine.setp() <csoundengine.engine.Engine.setp>`
-  and :meth:`Engine.getp() <csoundengine.engine.Engine.getp>`
+  value. Any parg can also be modulated in real-time.
+  See :meth:`Engine.setp() <csoundengine.engine.Engine.setp>`
+
 * **Event ids / Modulation** - in *csoundengine* every event can have a unique id assigned,
   allowing the user to control it during performance, from python or from csound directly.
 * **Informed use of the Csound API** - *csoundengine* uses the most convenient part of the

{csoundengine-2.23.0 → csoundengine-2.24.0}/docs/index.rst

@@ -14,7 +14,8 @@ Interaction with *csound* is through its API using
 `libcsound <https://github.com/csound-plugins/libcsound>`_.
 See the `Csound FLOSS manual <https://flossmanual.csound.com/introduction/preface>`_
 to learn more about csound and its syntax and run examples online. **csoundengine**
-is compatible with any recent version of csound6 (>= 6.16) and csound7
+is compatible with any recent version of csound7 (csound 6 is supported but
+it has been declared EOL)
 
 The source code of this package is hosted at https://github.com/gesellkammer/csoundengine
 

{csoundengine-2.23.0 → csoundengine-2.24.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csoundengine"
-version = "2.23.0"
+version = "2.24.0"
 license = { file = "LICENSE.txt" }
 description = "An audio synthesis framework using csound"
 authors = [
@@ -19,7 +19,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 
 dependencies = [
     "numpy",
@@ -35,12 +35,12 @@ dependencies = [
     "docstring_parser",
     "typing_extensions",
 
-    "libcsound>=0.16.1",
+    "libcsound>=0.17.1",
     "sndfileio>=2.1.1",
     "emlib>=1.20",
     "configdict>=2.10.0",
     "pitchtools>=1.14.0",
-    "risset>=3.2.2",
+    "risset>=3.5.7",
     "sounddevice",
 ]
 
@@ -48,8 +48,8 @@ dependencies = [
 packages = ["csoundengine"]
 
 
-[tool.setuptools.package-data]
-csoundengine = ['csoundengine/data']
+# [tool.setuptools.package-data]
+# csoundengine = ['csoundengine/data']
 
 
 [project.urls]

csoundengine-2.24.0/test/testdeps.py

@@ -0,0 +1,46 @@
+"""
+Check that all dependencies needed by csoundengine (csound and its plugins)
+are available even if csound is not preinstalled in the system.
+
+csoundengine does not use the csound binary. The csound library comes
+with the pip package ``libcsound``, which installs csound (and the needed
+plugins) on demand the first time it is imported if no csound
+installation is found.
+
+This test is meant to be run in a clean environment where csound is not
+installed (see the ``testdeps`` job in .github/workflows/test2.yml)
+"""
+import sys
+import shutil
+import platform
+import logging
+
+logging.basicConfig(level=logging.DEBUG,
+                    format="%(levelname)s %(name)s: %(message)s")
+
+print("python  :", sys.version)
+print("platform:", platform.platform())
+print("machine :", platform.machine())
+
+csoundbin = shutil.which("csound")
+print(f"csound binary in path: {csoundbin or '<not found>'}")
+if csoundbin:
+    print("Warning: csound is preinstalled, the auto-installation of csound"
+          " by libcsound will not be exercised")
+
+# Importing csoundengine imports libcsound. If no csound installation is
+# found, libcsound installs csound (together with its plugins) automatically
+import csoundengine  # noqa: F401
+from csoundengine import dependencies
+
+ok = dependencies.checkDependencies(force=True, fix=True)
+pluginsok = dependencies.pluginsInstalled(cached=False)
+print(f"Dependencies ok: {ok}")
+print(f"Plugins ok: {pluginsok}")
+if not (ok and pluginsok):
+    print("******************* Some dependencies are not met")
+    sys.exit(1)
+
+from csoundengine import csoundlib
+print("csound version:", csoundlib.getVersion())
+print(":::::::::::::::: All dependencies are installed")

csoundengine-2.23.0/.cirrus.yml

@@ -1,40 +0,0 @@
-container:
-  image: python:latest
-
-test_task:
-
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
-
-  test_script: |
-    set -x
-    ls -l
-    python3 -c 'import platform; print(platform.machine(), platform.uname())'  # , platform.dist())'
-    brew install csound
-
-    python3 -m venv .venv
-    source .venv/bin/activate
-    
-    python3 -m pip install .
-    cd test
-    python3 test1.py -o test1-mac-arm64.wav
-    python3 test2.py
-    
-    ls -l
-    cd ..
-        
-  binaries_artifacts:
-    path: test/*.wav
-
-
-
-#
-# OSX
-#
-#osx_task:
-#  auto_cancellation: true
-
-#
-#  check_script:
-#    - python3 -c "import platform; print(platform.machine(), platform.architecture())"
-

csoundengine-2.23.0/docs/Installation.rst

@@ -1,19 +0,0 @@
-Installation
-============
-
-`csoundengine` needs a python version >= 3.8. For all platforms, the installation is 
-the same::
-
-    pip install csoundengine
-
-    
-Dependencies
-------------
-
-**csoundengine** depends on **csound** itself being installed. At the moment the minimal
-version of csound supported is **6.16**. **csound 7**, even if not officially released
-yet, is supported and tested regularly.
-
-For **macos** and **windows**, **csound** can be installed by the provided installers
-(`<https://github.com/csound/csound/releases>`_). For linux, the installation via
-the distribution's package manager is the recommended way.