refactor: remove mmCoreAndDevices source code , use meson wraps (#65)

* wip using meson wraps

* working

* add test dep

* remove wheelhouse

* more update

* remove file

* fix meson

* add test

* fix version

* add setup

* change download

* fix sdist

* add download

* remove uvx

* remove bash

* update deploy version

* less stuff

* remove generate_dist

* remove factory

* fix tests

* whoops

* clean wheelhouse too

* use test-groups instead

* update readme

* add pymmcore-plus test

* remove src/mmcore

* remove nodev

* remove no build isolation

* change adapter strategy

* use msvc

Author: tlambert03

.github/workflows/ci.yml

@@ -36,14 +36,10 @@ jobs:
         if: matrix.platform == 'windows-latest'
         with:
           toolset: "14.29"
-      
-      # - name: install boost
-      #   if: matrix.platform == 'windows-latest'
-      #   run: choco install boost-msvc-14.2
 
       - name: install
-        # install with devices=true coverage=true
-        run: just install true true
+        # install with coverage=true
+        run: just install true
 
       - name: test
         run: uv run --no-sync pytest --color=yes -v --cov --cov-report=xml
@@ -55,3 +51,40 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml,./coverage_cpp.xml
+
+  test-pymmcore-plus:
+    name: test pymmcore-plus ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    env:
+      UV_NO_SYNC: "1"
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          repository: pymmcore-plus/pymmcore-plus
+      - uses: actions/checkout@v5
+        with:
+          path: pymmcore-nano
+      - uses: astral-sh/setup-uv@v6
+        with:
+          python-version: "3.13"
+          enable-cache: true
+      - uses: ilammy/msvc-dev-cmd@v1
+        if: matrix.os == 'windows-latest'
+        with:
+          toolset: "14.29"
+      - name: Setup MM test adapters
+        uses: pymmcore-plus/setup-mm-test-adapters@main
+        with:
+          version: 74
+      - name: Install dependencies
+        run: |
+          uv sync --no-dev --group test
+          uv pip install ./pymmcore-nano
+          uv pip uninstall pymmcore
+          uv pip list
+
+      - run: uv run pytest -v --color=yes -W ignore

.github/workflows/deploy.yml

@@ -29,15 +29,11 @@ jobs:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-          submodules: "recursive"
-
       - uses: ilammy/msvc-dev-cmd@v1
         with:
           toolset: "14.29"
-
-      - run: |
-          pip install meson
-          meson rewrite kwargs set project / version $(python scripts/extract_version.py)
+      - uses: astral-sh/setup-uv@v6
+      - run: uv run --no-dev --group build scripts/extract_version.py --update
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v3.1
@@ -60,13 +56,11 @@ jobs:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-          submodules: "recursive"
-
+      - uses: astral-sh/setup-uv@v6
       - name: Build sdist
         run: |
-          pip install -U pip build meson
-          meson rewrite kwargs set project / version $(python scripts/extract_version.py)
-          python -m build --sdist
+          uv run --no-dev --group build scripts/extract_version.py --update
+          uv build --sdist
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/docs.yml

@@ -22,8 +22,6 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-          submodules: "recursive"
-
       - uses: astral-sh/setup-uv@v6
 
       - name: Deploy to GitHub Pages

.gitignore

@@ -15,4 +15,4 @@ __pycache__
 .coverage
 coverage/
 coverage*
-tests/adapters/
+wheelhouse/

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ ci:
   autofix_commit_msg: "style(pre-commit.ci): auto fixes [...]"
   autoupdate_commit_msg: "ci(pre-commit.ci): autoupdate"
 
-exclude: ^src/mmCoreAndDevices
+exclude: ^subprojects/
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks

README.md

@@ -10,18 +10,22 @@ Experimental python bindings for [CMMCore](https://github.com/micro-manager/mmCo
 (the device abstraction layer for micro-manager) using [nanobind](https://nanobind.readthedocs.io/en/latest/).
 
 This package can be used as a (mostly) drop-in replacement for [`pymmcore`](https://pypi.org/project/pymmcore/).
-There are a few slight differences in behavior.  You are encouraged to try it where you might use 
+There are a few slight differences in behavior.  You are encouraged to try it where you might use
 pymmcore; and [let us know](https://github.com/pymmcore-plus/pymmcore-nano/issues) if you run into any issues!
 
 ## Installation
 
 ```sh
 pip install pymmcore-nano
+
+# optionally include device adapters commonly used for demos and testing
+# (DemoCamera, Utilities, etc...)
+pip install 'pymmcore-nano[test-devices]'
 ```
 
 Versioning is the same as for pymmcore.  
 
-```
+```txt
 MMCoreMajor.MMCoreMinor.MMCorePatch.DeviceInterface.pymmcore-nano-build
 ```
 
@@ -32,7 +36,6 @@ For example, the version `11.3.0.71.2` refers to:
 - pymmcore-nano build number of 2 (this is a zero indexed version that resets each time
 the MMCore or Device Interface versions increment)
 
-
 ## For Developers
 
 ### Clone repo

justfile

@@ -4,13 +4,12 @@ set windows-shell := ["pwsh", "-NoLogo", "-NoProfileLoadTime", "-Command"]
 builddir := "builddir"
 
 # install deps and editable package for development
-install devices="true" coverage="false" verbose="true":
+install coverage="false" verbose="true":
 	uv sync --no-install-project
 	uv pip install -e . \
 		--no-build-isolation \
 		--no-deps \
 		--force-reinstall \
-		-C=setup-args="-Dbuild_device_adapters={{devices}}" \
 		-C=setup-args="-Db_coverage={{coverage}}" \
 		-C=setup-args="-Dbuildtype=debugoptimized" \
 		-C=build-dir={{builddir}} \
@@ -22,7 +21,7 @@ build:
 
 # clean up all build artifacts
 clean:
-	rm -rf build dist {{ builddir }}
+	rm -rf build dist wheelhouse {{ builddir }}
 	rm -rf .coverage coverage coverage.info coverage.xml coverage_cpp.xml
 	rm -rf .ruff_cache .mypy_cache .pytest_cache
 	rm -rf .mesonpy-*
@@ -42,7 +41,7 @@ test:
 # run tests with coverage
 test-cov:
 	just clean-cov
-	just install true true true
+	just install true true
 	rm -rf coverage coverage.xml coverage_cpp.xml
 	{{ python }} -m pytest -v --color=yes --cov --cov-report=xml
 	gcovr

meson.build

@@ -1,36 +1,31 @@
 # replace the version by running:
 # meson rewrite kwargs set project / version $(python scripts/extract_version.py)
 project(
-  'pymmcore-nano',
-  'cpp',
-version : '11.9.0.73.2',
-  meson_version : '>= 1.2.0',
-  default_options : ['cpp_std=c++17']
+    'pymmcore-nano',
+    'cpp',
+    version: '11.10.0.74.0',
+    meson_version: '>=1.4.0',
+    default_options: ['cpp_std=c++17'],
 )
 
 if host_machine.system() == 'darwin'
-  add_project_arguments('-U_LIBCPP_ENABLE_ASSERTIONS', language: 'cpp')
+    add_project_arguments('-U_LIBCPP_ENABLE_ASSERTIONS', language: 'cpp')
 endif
 
 py = import('python').find_installation(pure: false)
 nanobind_dep = dependency('nanobind', static: true)
 
-
 # Run a command to get the Python include path
 python_include_path = run_command(
-    py.full_path(), ['-c', 'import sysconfig; print(sysconfig.get_paths()["include"])']
+    py.full_path(),
+    ['-c', 'import sysconfig; print(sysconfig.get_paths()["include"])'],
 ).stdout().strip()
 
-# Include the subprojects.
-subdir('src/mmCoreAndDevices/MMDevice')
-subdir('src/mmCoreAndDevices/MMCore')
-if get_option('build_device_adapters')
-    subdir('src/mmCoreAndDevices/DeviceAdapters')
-endif
-
-mmdevice_dep = dependency('mmdevice_dep')
-mmcore_dep   = dependency('mmcore_dep')
-
+mmcore_proj = subproject(
+    'mmcore',
+    default_options: {'default_library': 'static', 'tests': 'disabled'},
+)
+mmcore_dep = mmcore_proj.get_variable('mmcore')
 
 # --------------------------
 
@@ -47,11 +42,10 @@ if get_option('match_swig')
     cpp_args += ['-DMATCH_SWIG']
 endif
 
-
 ext_module = py.extension_module(
     '_pymmcore_nano',
-    sources: ['src/_pymmcore_nano.cc'] + mmcore_sources,
-    dependencies: [nanobind_dep, mmcore_dep, mmdevice_dep],
+    sources: ['src/_pymmcore_nano.cc'],
+    dependencies: [nanobind_dep, mmcore_dep],
     install: true,
     subdir: 'pymmcore_nano',
     cpp_args: cpp_args + ['-DNB_DOMAIN=pmn'],
@@ -67,7 +61,8 @@ custom_target(
         py.full_path(),
         meson.project_source_root() + '/scripts/build_stubs.py',
         ext_module.full_path(),
-        meson.project_source_root() + '/src/pymmcore_nano/_pymmcore_nano.pyi',
+        meson.project_source_root()
+        + '/src/pymmcore_nano/_pymmcore_nano.pyi',
     ],
     depends: ext_module,
 )
@@ -91,5 +86,3 @@ test(
     args: ['-m', 'pytest', '--color=yes', '-v'],
     workdir: meson.current_source_dir(),
 )
-
-meson.add_dist_script(py.full_path(), meson.current_source_dir() / 'scripts/generate_dist.py')

meson_options.txt

@@ -8,11 +8,5 @@ option(
     'match_swig',
     type: 'boolean',
     value: true,
-    description: 'Define MATCH_SWIG, to export all enum instances as top level names'
-)
-option('client_interface', type: 'boolean', value: false,
-    description: 'Build for use by MMCore, as opposed to by a device adapter',
-)
-option('build_device_adapters', type: 'boolean', value: false,
-  description: 'Build device adapters in addition to the core library',
+    description: 'Define MATCH_SWIG, to export all enum instances as top level names',
 )

pyproject.toml

@@ -32,19 +32,26 @@ classifiers = [
 ]
 dependencies = ["numpy>=1.25"]
 
+[project.optional-dependencies]
+test-devices = ["mm-test-adapters~=74.0"]
+
 [dependency-groups]
 build = ["meson-python", "nanobind", "ninja", "ruff", "typing_extensions"]
+test = [
+    "pytest",
+    "pytest-cov",
+    "gcovr",
+    "libclang>=18.1.1",
+    "pymmcore-nano[test-devices]",
+]
 dev = [
+    { include-group = "test" },
     { include-group = "build" },
     "clang-format>=19.1.7",
-    "libclang>=18.1.1",
-    "gcovr",
     "ipython",
     "mypy",
     "pdbpp; sys_platform != 'win32'",
     "pre-commit-uv",
-    "pytest-cov",
-    "pytest",
     "rich",
     "rust-just",
 ]
@@ -67,7 +74,7 @@ show_missing = true
 
 [tool.coverage.run]
 omit = ['subprojects/']
-source = ["pymmcore_nano", "mmCoreAndDevices"]
+source = ["pymmcore_nano"]
 
 [tool.cibuildwheel]
 build-verbosity = 1
@@ -76,9 +83,8 @@ build-verbosity = 1
 # is specific to glibc and not available in musl-libc
 skip = ["*-manylinux_i686", "*-musllinux*", "*-win32", "pp*"]
 build = ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
-test-requires = ["pytest", 'libclang>=18.1.1']
+test-groups = ["test"]
 test-command = 'pytest "{project}/tests" -v'
-test-skip = ["*-macosx*", "*linux*"]                           # until we build device adapters locally
 
 [tool.cibuildwheel.macos]
 # https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon