napari-plugin-manager 0.1.9rc0__py3-none-any.whl → 0.1.10__py3-none-any.whl

napari_plugin_manager/_tests/test_installer_process.py

@@ -261,7 +261,7 @@ def test_conda_installer(qtbot, caplog, monkeypatch, tmp_conda_env: Path):
     caplog.set_level(logging.DEBUG, logger=bqpi.__name__)
     conda_meta = tmp_conda_env / 'conda-meta'
     glob_pat = 'typing-extensions-*.json'
-    glob_pat_2 = 'packaging-*.json'
+    glob_pat_2 = 'cowpy-*.json'
     installer = NapariInstallerQueue()
 
     with qtbot.waitSignal(installer.allFinished, timeout=600_000):
@@ -293,7 +293,7 @@ def test_conda_installer(qtbot, caplog, monkeypatch, tmp_conda_env: Path):
         )
         installer.install(
             tool=InstallerTools.CONDA,
-            pkgs=['packaging'],
+            pkgs=['cowpy'],
             prefix=tmp_conda_env,
         )
         assert installer.currentJobs() == 2
@@ -312,7 +312,7 @@ def test_conda_installer(qtbot, caplog, monkeypatch, tmp_conda_env: Path):
         )
         job_id_2 = installer.install(
             tool=InstallerTools.CONDA,
-            pkgs=['packaging'],
+            pkgs=['cowpy'],
             prefix=tmp_conda_env,
         )
         assert installer.currentJobs() == 2
@@ -330,7 +330,7 @@ def test_conda_installer(qtbot, caplog, monkeypatch, tmp_conda_env: Path):
         )
         job_id_2 = installer.install(
             tool=InstallerTools.CONDA,
-            pkgs=['packaging'],
+            pkgs=['cowpy'],
             prefix=tmp_conda_env,
         )
         assert installer.currentJobs() == 2
@@ -370,7 +370,7 @@ def test_conda_installer_wait_for_finished(qtbot, tmp_conda_env: Path):
         )
         installer.install(
             tool=InstallerTools.CONDA,
-            pkgs=['packaging'],
+            pkgs=['cowpy'],
             prefix=tmp_conda_env,
         )
         installer.waitForFinished(30_000)

napari_plugin_manager/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.9rc0'
-__version_tuple__ = version_tuple = (0, 1, 9, 'rc0')
+__version__ = version = '0.1.10'
+__version_tuple__ = version_tuple = (0, 1, 10)
 
 __commit_id__ = commit_id = None

napari_plugin_manager/base_qt_package_installer.py

@@ -26,7 +26,6 @@ from subprocess import run
 from tempfile import gettempdir
 from typing import TypedDict
 
-from napari.plugins import plugin_manager
 from napari.plugins.npe2api import _user_agent
 from napari.utils.misc import StringEnum
 from napari.utils.translations import trans
@@ -694,7 +693,15 @@ class InstallerQueue(QObject):
             and exit_code == 0
         ):
             pm2 = PluginManager.instance()
-            npe1_plugins = set(plugin_manager.iter_available())
+            # new versions of napari after 0.7.0 won't have the plugin_manager
+            # this try/except block is to maintain compatibility
+            # between new napari-plugin-manager versions and old napari versions
+            try:
+                from napari.plugins import plugin_manager
+
+                npe1_plugins = set(plugin_manager.iter_available())
+            except ImportError:
+                npe1_plugins = set()
             for pkg in current.pkgs:
                 if pkg in pm2:
                     pm2.unregister(pkg)

napari_plugin_manager/base_qt_plugin_dialog.py

@@ -1471,13 +1471,10 @@ class BaseQtPluginDialog(QDialog):
         self.working_indicator.setMovie(mov)
         mov.start()
 
-        visibility_direct_entry = not self._on_bundle()
         self.direct_entry_edit = QLineEdit(self)
         self.direct_entry_edit.installEventFilter(self)
         self.direct_entry_edit.returnPressed.connect(self._install_packages)
-        self.direct_entry_edit.setVisible(visibility_direct_entry)
         self.direct_entry_btn = QToolButton(self)
-        self.direct_entry_btn.setVisible(visibility_direct_entry)
         self.direct_entry_btn.clicked.connect(self._install_packages)
         self.direct_entry_btn.setText(self._trans('Install'))
 
@@ -1518,8 +1515,6 @@ class BaseQtPluginDialog(QDialog):
 
         buttonBox.addWidget(self.direct_entry_edit)
         buttonBox.addWidget(self.direct_entry_btn)
-        if not visibility_direct_entry:
-            buttonBox.addStretch()
         buttonBox.addWidget(self.process_success_indicator)
         buttonBox.addWidget(self.process_error_indicator)
         buttonBox.addWidget(self.show_status_btn)

napari_plugin_manager/npe2api.py

@@ -23,6 +23,10 @@ from napari_plugin_manager.utils import get_homepage_url
 
 PyPIname = str
 
+BASE_API_URL = 'https://api.napari.org/api'
+EXTENDED_SUMMARY_URL = f'{BASE_API_URL}/extended_summary'
+CONDA_URL = f'{BASE_API_URL}/conda'
+
 
 @lru_cache
 def _user_agent() -> str:
@@ -51,7 +55,7 @@ def _user_agent() -> str:
 
 
 class _ShortSummaryDict(TypedDict):
-    """Objects returned at https://npe2api.vercel.app/api/extended_summary ."""
+    """Objects returned from API extended_summary endpoint."""
 
     name: NotRequired[PyPIname]
     version: str
@@ -70,16 +74,18 @@ class SummaryDict(_ShortSummaryDict):
 @lru_cache
 def plugin_summaries() -> list[SummaryDict]:
     """Return PackageMetadata object for all known napari plugins."""
-    url = 'https://npe2api.vercel.app/api/extended_summary'
-    with urlopen(Request(url, headers={'User-Agent': _user_agent()})) as resp:
+    with urlopen(
+        Request(EXTENDED_SUMMARY_URL, headers={'User-Agent': _user_agent()})
+    ) as resp:
         return json.load(resp)
 
 
 @lru_cache
 def conda_map() -> dict[PyPIname, str | None]:
     """Return map of PyPI package name to conda_channel/package_name ()."""
-    url = 'https://npe2api.vercel.app/api/conda'
-    with urlopen(Request(url, headers={'User-Agent': _user_agent()})) as resp:
+    with urlopen(
+        Request(CONDA_URL, headers={'User-Agent': _user_agent()})
+    ) as resp:
         return json.load(resp)
 
 

napari_plugin_manager/qt_plugin_dialog.py

@@ -104,12 +104,20 @@ class PluginListItem(BasePluginListItem):
         if plugin_name in pm2:
             pm2.enable(plugin_name) if state else pm2.disable(plugin_name)
             return
-
+        # new versions of napari after 0.7.0 won't have the plugin_manager
+        # this try/except block is to maintain compatibility
+        # between new napari-plugin-manager versions and old napari versions
+        try:
+            from napari.plugins import plugin_manager
+
+            npe1_plugins = set(plugin_manager.iter_available())
+        except ImportError:
+            npe1_plugins = set()
         for (
             npe1_name,
             _,
             distname,
-        ) in napari.plugins.plugin_manager.iter_available():
+        ) in npe1_plugins:
             if distname and (normalized_name(distname) == plugin_name):
                 napari.plugins.plugin_manager.set_blocked(
                     npe1_name, not enabled

{napari_plugin_manager-0.1.9rc0.dist-info → napari_plugin_manager-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: napari-plugin-manager
-Version: 0.1.9rc0
+Version: 0.1.10
 Summary: Install plugins for napari, in napari.
 Author-email: napari team <napari-steering-council@googlegroups.com>
 License-Expression: BSD-3-Clause

{napari_plugin_manager-0.1.9rc0.dist-info → napari_plugin_manager-0.1.10.dist-info}/RECORD

@@ -1,10 +1,10 @@
 napari_plugin_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-napari_plugin_manager/_version.py,sha256=vMAMuAXkLGf7Eht-tItx7c6RdxbqXFQlKF4k0B7bfwk,714
-napari_plugin_manager/base_qt_package_installer.py,sha256=O5WgL23H9Y2ozVsdZ1eBf0nnmb8QtP7DVVXav2KSEtY,24551
-napari_plugin_manager/base_qt_plugin_dialog.py,sha256=0NDzTN7Bxek5mr4DZDPJVddh1eDjIwZtUxeKFSCQToA,67432
-napari_plugin_manager/npe2api.py,sha256=gAPOC-g0GWAwN71m0GimM0SW6YHI39XxSJm_qhq3-OY,4352
+napari_plugin_manager/_version.py,sha256=uf7mpKSLRNNF3RxSXHssYzKadEgmCS7IlRw4lFPAcUg,706
+napari_plugin_manager/base_qt_package_installer.py,sha256=AgCQtCjzTgzR-by_Csrr8MVaCDoWPQgESY9SG-PKpCE,24883
+napari_plugin_manager/base_qt_plugin_dialog.py,sha256=XLRQJ-qqNgry4RMvor20hXNp02pkcNcw_PY2OwL9P58,67168
+napari_plugin_manager/npe2api.py,sha256=IfAkr3HNEUnqhHJgeCKm6kvkm7mUaLLMRjXwSJXcPq8,4416
 napari_plugin_manager/qt_package_installer.py,sha256=QFQDED3MKbQupKF7OjBPz70cK2zrgIP2gu4vdUVV8Tk,3511
-napari_plugin_manager/qt_plugin_dialog.py,sha256=seaKKoeFsPK7L2z4fj6-UGuNYBqZ1I-U54AcZ0uu9Ok,10321
+napari_plugin_manager/qt_plugin_dialog.py,sha256=8YY9RJBgHnhZJpVtwxSjY0V5xXB3tpnlx5Hv0MIS8H8,10692
 napari_plugin_manager/qt_warning_dialog.py,sha256=DtPoFBn7zDfSmkdMokm1BcuoYasngkC0jwJok-oIuGk,727
 napari_plugin_manager/qt_widgets.py,sha256=OatVQPuJFP5sgYRq_KiaynwXI3UfLGiTwBRlFy-b5mk,399
 napari_plugin_manager/styles.qss,sha256=2oJBNiLT3YtqQP3avQGAOWcSSOZiFHGDsHtI5TjjxuA,7928
@@ -12,12 +12,12 @@ napari_plugin_manager/utils.py,sha256=vGvOndyiwc_JaSHVtXIc9z-dGsewo_vRb31U-26vy2
 napari_plugin_manager/_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 napari_plugin_manager/_tests/conftest.py,sha256=Bm8u6hT5-mQXaxamke79tJGrU8BZA3V444YBLPivVr8,1885
 napari_plugin_manager/_tests/test_base_installer_process.py,sha256=Cv-nBnUeNAX6pYUE1zs38I9vGtCE-ahBN4q-xcBH-pw,561
-napari_plugin_manager/_tests/test_installer_process.py,sha256=0kyPzUcx1-yVc21B0HQkf4TCLnkDWBDtaJU-UXSVk1s,12821
+napari_plugin_manager/_tests/test_installer_process.py,sha256=xWK5xyini6L0rEvwxTacz-JCTODGqUga9fpaUr7KiuY,12801
 napari_plugin_manager/_tests/test_npe2api.py,sha256=ncBGWHrA5uZjmt6w4lVlx8D-n_3At1bfAZgkMRxK7Lg,1275
 napari_plugin_manager/_tests/test_qt_plugin_dialog.py,sha256=Rcfaho94vM7iwumU4n6ygyP5O3E7lsXIpoAwpXmI2YA,20702
 napari_plugin_manager/_tests/test_utils.py,sha256=rAlqp8y1MR3U4nWCN1jekbvP_avket3fVgEQwJDqpKk,1674
-napari_plugin_manager-0.1.9rc0.dist-info/licenses/LICENSE,sha256=8dAlKbOqTMYe9L-gL_kEx5Xr1Sd0AbaWQDUkpiOp3vI,1506
-napari_plugin_manager-0.1.9rc0.dist-info/METADATA,sha256=VXdaFngOPP4KtklRpG5MFba-zWBcgZ60g_8ajEeQ6Bk,12158
-napari_plugin_manager-0.1.9rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-napari_plugin_manager-0.1.9rc0.dist-info/top_level.txt,sha256=pmCqLetuumhY1CKSuTZ5eQsitzazrSvc7V_mkugEPTY,22
-napari_plugin_manager-0.1.9rc0.dist-info/RECORD,,
+napari_plugin_manager-0.1.10.dist-info/licenses/LICENSE,sha256=8dAlKbOqTMYe9L-gL_kEx5Xr1Sd0AbaWQDUkpiOp3vI,1506
+napari_plugin_manager-0.1.10.dist-info/METADATA,sha256=2ApKs8AueZ6fnQ-yHKt2chDXgyAirWQnzoPdqJEyvNw,12156
+napari_plugin_manager-0.1.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+napari_plugin_manager-0.1.10.dist-info/top_level.txt,sha256=pmCqLetuumhY1CKSuTZ5eQsitzazrSvc7V_mkugEPTY,22
+napari_plugin_manager-0.1.10.dist-info/RECORD,,

{napari_plugin_manager-0.1.9rc0.dist-info → napari_plugin_manager-0.1.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any