From e2a8d7120a179c26295431a5c40820dcda6bb8f0 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Wed, 11 Oct 2023 03:04:15 +0200 Subject: [PATCH] Migrate to npe2 (#29) * migrate to npe2 * remove napari-plugin-engine dependency --- napari_console/_hookimpl.py | 1 - napari_console/napari.yaml | 2 ++ pyproject.toml | 2 +- setup.cfg | 43 ++++++++++++++++--------------------- 4 files changed, 22 insertions(+), 26 deletions(-) create mode 100644 napari_console/napari.yaml diff --git a/napari_console/_hookimpl.py b/napari_console/_hookimpl.py index d4ea1ca..8d3bcb3 100644 --- a/napari_console/_hookimpl.py +++ b/napari_console/_hookimpl.py @@ -1,4 +1,3 @@ -from napari_plugin_engine import napari_hook_implementation from .qt_console import QtConsole # Wait to use hook impl diff --git a/napari_console/napari.yaml b/napari_console/napari.yaml new file mode 100644 index 0000000..9f6285f --- /dev/null +++ b/napari_console/napari.yaml @@ -0,0 +1,2 @@ +name: napari-console +schema_version: 0.1.0 diff --git a/pyproject.toml b/pyproject.toml index 9a52887..ee0b474 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools >= 42", "wheel", - "setuptools_scm>=3.4" + "setuptools_scm>=8.0" ] build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index 0b9836a..df87e31 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,48 +1,43 @@ [metadata] name = napari-console -url = https://github.com/napari/napari-console -license = BSD 3-Clause -license_file = LICENSE description = A plugin that adds a console to napari long_description = file: README.md long_description_content_type = text/markdown +url = https://github.com/napari/napari-console author = Nicholas Sofroniew author_email = sofroniewn@gmail.com +license = BSD-3-Clause +license_files = LICENSE classifiers = Development Status :: 4 - Beta - Intended Audience :: Developers Framework :: napari - Topic :: Software Development :: Testing + Intended Audience :: Developers + License :: OSI Approved :: BSD License + Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 - Operating System :: OS Independent - License :: OSI Approved :: BSD License + Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 + Topic :: Software Development :: Testing [options] -zip_safe = False packages = find: -python_requires = >=3.8 -include_package_data = True install_requires = - ipykernel>=5.2.0 IPython>=7.7.0 - napari-plugin-engine>=0.1.9 - qtconsole>=4.5.1,!=4.7.6,!=5.4.2 + ipykernel>=5.2.0 + qtconsole!=4.7.6,!=5.4.2,>=4.5.1 qtpy>=1.7.0 - -[options.package_data] -* = *.pyi -napari_builtins = - builtins.yaml - -# for explanation of %(extra)s syntax see: -# https://github.com/pypa/setuptools/issues/1260#issuecomment-438187625 -# this syntax may change in the future +python_requires = >=3.8 +include_package_data = True +zip_safe = False [options.entry_points] -napari.plugin = - console = napari_console +napari.manifest = + napari-console = napari_console:napari.yaml + +[options.package_data] +napari_console = napari.yaml