Merge pull request #152 from SpotlightKid/develop

fix windows build CI

Author: brunoenten

.github/workflows/development.yml

@@ -21,6 +21,9 @@ jobs:
    - name: Install ninja
      run: pipx install ninja
 
+   - name: Install alsa deps
+     run: sudo apt-get install libasound2-dev
+
    - name: Build sdist
      run: pipx run build --sdist
 
@@ -44,6 +47,9 @@ jobs:
       with:
         submodules: true
 
+    - uses: ilammy/msvc-dev-cmd@v1
+      if: matrix.os == 'windows-latest'
+
     - name: Build wheels
       uses: pypa/[email protected]
 

.github/workflows/production.yml

@@ -22,6 +22,9 @@ jobs:
    - name: Install ninja
      run: pipx install ninja
 
+   - name: Install alsa deps
+     run: sudo apt-get install libasound2-dev
+
    - name: Build sdist
      run: pipx run build --sdist
 
@@ -44,6 +47,9 @@ jobs:
       with:
         submodules: true
 
+    - uses: ilammy/msvc-dev-cmd@v1
+      if: matrix.os == 'windows-latest'
+
     - name: Build wheels
       uses: pypa/[email protected]
 

.github/workflows/tests.yml

@@ -3,10 +3,10 @@ name: Build sdist and wheel for testing purposes
 on:
   push:
     branches:
-      - rtmidi-5.0.0
+      - improve-build
   pull_request:
     branches:
-      - rtmidi-5.0.0
+      - improve-build
 
 jobs:
   build_sdist:
@@ -21,6 +21,9 @@ jobs:
    - name: Install ninja
      run: pipx install ninja
 
+   - name: Install alsa deps
+     run: sudo apt-get install libasound2-dev
+
    - name: Build sdist
      run: pipx run build --sdist
 
@@ -44,6 +47,9 @@ jobs:
       with:
         submodules: true
 
+    - uses: ilammy/msvc-dev-cmd@v1
+      if: matrix.os == 'windows-latest'
+
     - name: Build wheels
       uses: pypa/[email protected]
 

meson.build

@@ -1,7 +1,7 @@
 project(
     'python-rtmidi',
     'cpp',
-    version: '1.5.0',
+    version: '1.5.1',
     license: 'MIT',
     default_options: [
         'warning_level=2'
@@ -11,40 +11,9 @@ project(
 
 cpp = meson.get_compiler('cpp')
 
-## From https://github.com/numpy/numpy/blob/main/numpy/meson.build
-# Platform detection
-if host_machine.system() == 'windows' and cpp.get_id() == 'gcc'
-  # For mingw-w64, link statically against the UCRT.
-  gcc_link_args = ['-lucrt', '-static']
-
-  add_project_link_arguments(gcc_link_args, language: ['c', 'cpp'])
-  # Force gcc to float64 long doubles for compatibility with MSVC
-  # builds, for C only.
-  add_project_arguments('-mlong-double-64', language: 'c')
-  # Make fprintf("%zd") work (see https://github.com/rgommers/scipy/issues/118)
-  add_project_arguments('-D__USE_MINGW_ANSI_STDIO=1', language: ['c', 'cpp'])
-  # Manual add of MS_WIN64 macro when not using MSVC.
-  # https://bugs.python.org/issue28267
-  add_project_arguments('-DMS_WIN64', language: ['c', 'cpp'])
-endif
-##
-
-if host_machine.system() == 'darwin'
-  # Enable c++11 support
-  add_project_arguments('-std=c++11', language: ['cpp'])
-endif
-
-# Dependencies
+# Jack API (portable)
 jack2_dep = dependency('jack', version: '>=1.9.11', required: false)
 jack1_dep = dependency('jack', version: ['>=0.125.0', '<1.0'], required: false)
-alsa_dep = dependency('alsa', required: false)
-threads_dep = dependency('threads')
-coremidi_dep = dependency(
-    'appleframeworks',
-    modules: ['coreaudio', 'coremidi', 'foundation'],
-    required: false
-)
-winmm_dep = cpp.find_library('winmm', required: false)
 
 if not jack2_dep.found() and jack1_dep.found()
     jack_dep = jack1_dep
@@ -55,6 +24,50 @@ else
     jack_dep = disabler()
 endif
 
+
+jack_not_found = jack_dep.found() ? false : true
+
+## From https://github.com/numpy/numpy/blob/main/numpy/meson.build
+# Platform dependent config
+if host_machine.system() == 'windows'
+    # WINDOWS
+    if cpp.get_id() == 'gcc'
+        # For mingw-w64, link statically against the UCRT.
+        gcc_link_args = ['-lucrtbase', '-static']
+        add_project_link_arguments(gcc_link_args, language: ['c', 'cpp'])
+        # Make fprintf("%zd") work (see https://github.com/rgommers/scipy/issues/118)
+        add_project_arguments('-D__USE_MINGW_ANSI_STDIO=1', language: ['c', 'cpp'])
+        # Manual add of MS_WIN64 macro when not using MSVC.
+        # https://bugs.python.org/issue28267
+        add_project_arguments('-DMS_WIN64', language: ['c', 'cpp'])
+    elif cpp.get_id() == 'msvc'
+        # Force gcc to float64 long doubles for compatibility with MSVC
+        # builds, for C only.
+        add_project_arguments('-mlong-double-64', language: 'c')
+    endif
+
+    # API
+    winmm_dep = cpp.find_library('winmm', required: jack_not_found)
+elif host_machine.system() == 'darwin'
+    # OSX
+
+    # Enable c++11 support
+    add_project_arguments('-std=c++11', language: ['cpp'])
+
+    # API
+    coremidi_dep = dependency(
+        'appleframeworks',
+        modules: ['coreaudio', 'coremidi', 'foundation'],
+        required: jack_not_found
+    )
+else
+    # LINUX
+
+    # API
+    alsa_dep = dependency('alsa', required: jack_not_found)
+    threads_dep = dependency('threads')
+endif # Platform detection
+
 pymod = import('python')
 python = pymod.find_installation(get_option('python'), required: true)
 
@@ -72,8 +85,9 @@ endif
 summary({
     'Debug messages (verbose)': get_option('verbose'),
     'Build for wheel': get_option('wheel'),
+    'JACK support': jack_dep.found() and get_option('jack'),
     'ALSA support': host_machine.system() == 'linux' and alsa_dep.found() and get_option('alsa'),
     'CoreMIDI support': host_machine.system() == 'darwin' and coremidi_dep.found() and get_option('coremidi'),
-    'JACK support': jack_dep.found() and get_option('jack'),
     'Window MM support': host_machine.system() == 'windows' and winmm_dep.found() and get_option('winmm'),
 }, section: 'Configuration')
+

pyproject.toml

@@ -44,6 +44,7 @@ keywords = [
 meson-python-option-name = "python"
 meson-options = [
     "-Dwheel=true",
+    "-Dverbose=true",
     "--buildtype=plain"
 ]
 
@@ -84,6 +85,10 @@ skip = "pp*"
 manylinux-x86_64-image = "manylinux_2_28"
 manylinux-aarch64-image = "manylinux_2_28"
 
+# Run the package tests using `pytest`
+test-command = "pytest {package}/tests/test_basic.py"
+test-requires = "pytest"
+
 # Install system library
 [tool.cibuildwheel.linux]
 build = "cp3{8,9,10,11}-manylinux*"
@@ -110,6 +115,4 @@ before-all = [
 [tool.cibuildwheel.windows]
 build = "cp3{8,9,10,11}-win*"
 archs = ["AMD64"]
-before-all = [
-    "pipx install ninja",
-]
+build-verbosity = 1

rtmidi/meson.build

@@ -25,8 +25,9 @@ if host_machine.system() == 'linux' and alsa_dep.found() and get_option('alsa')
 endif
 
 if host_machine.system() == 'windows' and get_option('winmm')
+    defines += ['-D__WINDOWS_MM__']
     if meson.get_compiler('cpp').get_id() != 'gcc'
-        defines += ['-D__WINDOWS_MM__', '/EHsc']
+        defines += ['/EHsc']
     endif
     dependencies += [winmm_dep]
 endif
@@ -36,7 +37,9 @@ if jack_dep.found() and get_option('jack')
     dependencies += [jack_dep]
 endif
 
-if not get_option('verbose')
+if get_option('verbose')
+    defines += ['-D__RTMIDI_DEBUG__']
+else
     defines += ['-D__RTMIDI_SILENCE_WARNINGS__']
 endif
 

src/_rtmidi.pyx

@@ -74,6 +74,9 @@ used to specify the low-level MIDI backend API to use when creating a
     Windows MultiMedia
 ``API_RTMIDI_DUMMY``
     RtMidi Dummy API (used when no suitable API was found)
+``API_RWEB_MIDI``
+    W3C Web MIDI API
+
 
 
 Error types
@@ -113,7 +116,7 @@ from libcpp.vector cimport vector
 
 __all__ = (
     'API_UNSPECIFIED', 'API_MACOSX_CORE', 'API_LINUX_ALSA', 'API_UNIX_JACK',
-    'API_WINDOWS_MM', 'API_RTMIDI_DUMMY', 'ERRORTYPE_DEBUG_WARNING',
+    'API_WINDOWS_MM', 'API_RTMIDI_DUMMY', 'API_WEB_MIDI', 'ERRORTYPE_DEBUG_WARNING',
     'ERRORTYPE_DRIVER_ERROR', 'ERRORTYPE_INVALID_DEVICE',
     'ERRORTYPE_INVALID_PARAMETER', 'ERRORTYPE_INVALID_USE',
     'ERRORTYPE_MEMORY_ERROR', 'ERRORTYPE_NO_DEVICES_FOUND',
@@ -148,6 +151,7 @@ cdef extern from "RtMidi.h":
         UNIX_JACK    "RtMidi::UNIX_JACK"
         WINDOWS_MM   "RtMidi::WINDOWS_MM"
         RTMIDI_DUMMY "RtMidi::RTMIDI_DUMMY"
+        WEB_MIDI     "RtMidi::WEB_MIDI_API"
 
     cdef enum ErrorType "RtMidiError::Type":
         ERR_WARNING           "RtMidiError::WARNING"
@@ -244,6 +248,7 @@ API_LINUX_ALSA = LINUX_ALSA
 API_UNIX_JACK = UNIX_JACK
 API_WINDOWS_MM = WINDOWS_MM
 API_RTMIDI_DUMMY = RTMIDI_DUMMY
+API_WEB_MIDI = WEB_MIDI
 
 # export error values to Python
 

src/meson_dist_cython.py

@@ -18,6 +18,7 @@
 ap.add_argument("mod_source", nargs="*", help="Cython module C++ source target(s) (*.cpp).")
 args = ap.parse_args()
 
+
 if args.verbose:
     print("cwd:", getcwd())
     print("build root:", build_root)

src/rtmidi

@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+""" Basic tests that don't need midi ports"""
+
+import unittest
+import rtmidi
+
+
+if bytes is str:
+    string_types = (str, unicode)  # noqa:F821
+else:
+    string_types = (str,)
+
+
+class BasicTest(unittest.TestCase):
+    def test_get_api_display_name(self):
+        self.assertEqual(rtmidi.get_api_display_name(rtmidi.API_LINUX_ALSA), 'ALSA')
+        self.assertEqual(rtmidi.get_api_display_name(rtmidi.API_MACOSX_CORE), 'CoreMidi')
+        self.assertEqual(rtmidi.get_api_display_name(rtmidi.API_RTMIDI_DUMMY), 'Dummy')
+        self.assertEqual(rtmidi.get_api_display_name(rtmidi.API_UNIX_JACK), 'Jack')
+        self.assertEqual(rtmidi.get_api_display_name(rtmidi.API_UNSPECIFIED), 'Unknown')
+        self.assertEqual(rtmidi.get_api_display_name(rtmidi.API_WINDOWS_MM), 'Windows MultiMedia')
+        self.assertEqual(rtmidi.get_api_display_name(rtmidi.API_WEB_MIDI), 'Web MIDI API')
+
+    def test_get_api_name(self):
+        self.assertEqual(rtmidi.get_api_name(rtmidi.API_LINUX_ALSA), 'alsa')
+        self.assertEqual(rtmidi.get_api_name(rtmidi.API_MACOSX_CORE), 'core')
+        self.assertEqual(rtmidi.get_api_name(rtmidi.API_RTMIDI_DUMMY), 'dummy')
+        self.assertEqual(rtmidi.get_api_name(rtmidi.API_UNIX_JACK), 'jack')
+        self.assertEqual(rtmidi.get_api_name(rtmidi.API_UNSPECIFIED), 'unspecified')
+        self.assertEqual(rtmidi.get_api_name(rtmidi.API_WINDOWS_MM), 'winmm')
+        self.assertEqual(rtmidi.get_api_name(rtmidi.API_WEB_MIDI), 'web')
+
+    def test_get_compiled_api(self):
+        apilist = rtmidi.get_compiled_api()
+        self.assertTrue(isinstance(apilist, list))
+        self.assertTrue(len(apilist) >= 1)
+        for api in apilist:
+            self.assertTrue(api <= rtmidi.API_RTMIDI_DUMMY)
+
+    def test_get_compiled_api_by_name(self):
+        for api, name in (
+                (rtmidi.API_LINUX_ALSA, 'alsa'),
+                (rtmidi.API_MACOSX_CORE, 'core'),
+                (rtmidi.API_RTMIDI_DUMMY, 'dummy'),
+                (rtmidi.API_UNIX_JACK, 'jack'),
+                (rtmidi.API_WINDOWS_MM, 'winmm'),
+                (rtmidi.API_WEB_MIDI, 'web'),):
+
+            res = rtmidi.get_compiled_api_by_name(name)
+
+            if api in rtmidi.get_compiled_api():
+                self.assertEqual(res, api)
+            else:
+                self.assertEqual(res, rtmidi.API_UNSPECIFIED)
+
+    def test_get_rtmidi_version(self):
+        version = rtmidi.get_rtmidi_version()
+        self.assertTrue(isinstance(version, string_types))
+        self.assertEqual(version, '5.0.0')
+
+    def test_nondummy_api_present(self):
+        # Make sure at least one actual API has been compiled
+        apilist = rtmidi.get_compiled_api()
+        apiFound = False
+        for api in apilist:
+            if api != rtmidi.API_RTMIDI_DUMMY:
+                apiFound = True
+        self.assertTrue(apiFound)
+
+if __name__ == '__main__':
+    unittest.main()