qgis-plugin-dev-tools 0.6.2__tar.gz → 0.7.0__tar.gz

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.0] - 2024-05-21
+
+- Fix: Bundle contents by parsing pep-compliant distribution file catalog instead of possibly missing tool-specific top-level.txt
+- Feat: Allow disabling auto-loaded entrypoint plugins
+
 ## [0.6.2] - 2023-09-27
 
 - Fix: Fix issues with bundling requirements of the requirements recursively
@@ -66,3 +71,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 [0.6.0]: https://github.com/nlsfi/qgis-plugin-dev-tools/releases/tag/v0.6.0
 [0.6.1]: https://github.com/nlsfi/qgis-plugin-dev-tools/releases/tag/v0.6.1
 [0.6.2]: https://github.com/nlsfi/qgis-plugin-dev-tools/releases/tag/v0.6.2
+[0.7.0]: https://github.com/nlsfi/qgis-plugin-dev-tools/releases/tag/v0.7.0

{qgis-plugin-dev-tools-0.6.2/src/qgis_plugin_dev_tools.egg-info → qgis_plugin_dev_tools-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qgis-plugin-dev-tools
-Version: 0.6.2
+Version: 0.7.0
 Summary: QGIS plugin development and packaging tools, which make managing runtime dependencies easy.
 Home-page: https://github.com/nlsfi/qgis-plugin-dev-tools
 Author: National Land Survey of Finland
@@ -135,6 +135,15 @@ Development mode also enables using and developing multiple plugins easily if ce
 
 Extra plugins are loaded on launch and reloaded together with the main plugin if [Plugin Reloader] is used.
 
+You can disable plugin auto-load by using `pyproject.toml` configuration (for example when using a dependency, that also provides a plugin entrypoint):
+
+```toml
+[tool.qgis_plugin_dev_tools]
+disabled_extra_plugins = [
+  "unwanted_plugin_package_name",
+]
+```
+
 ## Development of qgis-plugin-dev-tools
 
 See [development readme](./DEVELOPMENT.md).
@@ -156,6 +165,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.0] - 2024-05-21
+
+- Fix: Bundle contents by parsing pep-compliant distribution file catalog instead of possibly missing tool-specific top-level.txt
+- Feat: Allow disabling auto-loaded entrypoint plugins
+
 ## [0.6.2] - 2023-09-27
 
 - Fix: Fix issues with bundling requirements of the requirements recursively
@@ -218,3 +232,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 [0.6.0]: https://github.com/nlsfi/qgis-plugin-dev-tools/releases/tag/v0.6.0
 [0.6.1]: https://github.com/nlsfi/qgis-plugin-dev-tools/releases/tag/v0.6.1
 [0.6.2]: https://github.com/nlsfi/qgis-plugin-dev-tools/releases/tag/v0.6.2
+[0.7.0]: https://github.com/nlsfi/qgis-plugin-dev-tools/releases/tag/v0.7.0

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/README.md

@@ -105,6 +105,15 @@ Development mode also enables using and developing multiple plugins easily if ce
 
 Extra plugins are loaded on launch and reloaded together with the main plugin if [Plugin Reloader] is used.
 
+You can disable plugin auto-load by using `pyproject.toml` configuration (for example when using a dependency, that also provides a plugin entrypoint):
+
+```toml
+[tool.qgis_plugin_dev_tools]
+disabled_extra_plugins = [
+  "unwanted_plugin_package_name",
+]
+```
+
 ## Development of qgis-plugin-dev-tools
 
 See [development readme](./DEVELOPMENT.md).

qgis_plugin_dev_tools-0.7.0/pyproject.toml

@@ -0,0 +1,71 @@
+[tool.ruff]
+ignore = [
+    "ANN101", # Missing type annotation for self in method
+    ]
+line-length = 88
+
+# List of all rules https://docs.astral.sh/ruff/rules/
+select = [
+    "ANN", # flake8-annotations
+    "B", # flake8-bugbear
+    "C", # flake8-comprehensions
+    "C90", # flake8, mccabe
+    "E", # flake8, pycodestyle
+    "F", # flake8, Pyflakes
+    "I", # isort
+    "INP", # flake8-no-pep420
+    "N", # pep8-naming
+    "PIE", # flake8-pie
+    "PGH", # pygrep-hooks
+    "PL", # pylint
+    "PT", # flake8-pytest-style
+    "RUF", # Ruff-specific rules
+    "SIM", # flake8-simplify
+    "T", # flake8-print
+    "ICN", # flake8-import-conventions
+    "TCH", # flake8-type-checking
+    "TID", # flake8-tidy-imports
+    "W", # flake8, pycodestyle
+    "UP", # pyupgrade
+    ]
+
+# Avoiding flagging (and removing) `SC200` from any `# noqa`
+# directives, despite Ruff's lack of support for `flake8-spellcheck`.
+external = ["SC200"]
+
+target-version = "py39"
+
+[tool.ruff.flake8-tidy-imports]
+ban-relative-imports = "all"
+
+[tool.ruff.per-file-ignores]
+"test*" = [
+    "INP001",
+    "ANN201", # Missing return type annotation for public function
+    "ANN401", # Dynamically typed expressions (typing.Any) are disallowed
+    "PLR2004", # Magic value used in comparison, consider replacing {value} with a constant variable
+    ]
+
+
+[tool.flake8]
+max-line-length = 88
+spellcheck-targets = "names"
+dictionaries = "en_US,python,technical"
+extend-ignore = [
+    "E203",  # whitespace before ':'
+    "E501",  # line length (checked by ruff now, possible mismatches)
+]
+per-file-ignores = [
+    "test/*:INP001,SC200",
+]
+
+[tool.mypy]
+follow_imports = "normal"
+show_column_numbers = true
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"

qgis_plugin_dev_tools-0.7.0/setup.py

@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup()

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/__init__.py

@@ -20,7 +20,7 @@
 import logging
 import sys
 
-__version__ = "0.6.2"
+__version__ = "0.7.0"
 
 LOGGER = logging.getLogger(__name__)
 _handler = logging.StreamHandler(sys.stdout)

qgis_plugin_dev_tools-0.7.0/src/qgis_plugin_dev_tools/build/packaging.py

@@ -0,0 +1,192 @@
+#  Copyright (C) 2022 National Land Survey of Finland
+#  (https://www.maanmittauslaitos.fi/en).
+#
+#
+#  This file is part of qgis-plugin-dev-tools.
+#
+#  qgis-plugin-dev-tools is free software: you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as published
+#  by the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  qgis-plugin-dev-tools is distributed in the hope that it will be
+#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with qgis-plugin-dev-tools. If not, see <https://www.gnu.org/licenses/>.
+
+import logging
+import shutil
+import sys
+from importlib_metadata import Distribution
+from pathlib import Path
+
+from qgis_plugin_dev_tools.build.rewrite_imports import (
+    rewrite_imports_in_source_file,
+    insert_as_first_import,
+)
+from qgis_plugin_dev_tools.config import DevToolsConfig
+from qgis_plugin_dev_tools.utils.distributions import get_distribution_top_level_names
+
+IGNORED_FILES = shutil.ignore_patterns("__pycache__", "*.pyc", "*.pyi")
+LOGGER = logging.getLogger(__name__)
+
+VENDOR_PATH_APPEND_SCRIPT = """
+import sys
+from pathlib import Path
+
+sys.path.append(Path(__file__).parent.resolve().as_posix())
+"""
+
+
+def copy_plugin_code(
+    dev_tools_config: DevToolsConfig, build_directory_path: Path
+) -> None:
+    LOGGER.debug(
+        "copying %s to build directory",
+        dev_tools_config.plugin_package_path.resolve(),
+    )
+    shutil.copytree(
+        src=dev_tools_config.plugin_package_path,
+        dst=build_directory_path / dev_tools_config.plugin_package_name,
+        ignore=IGNORED_FILES,
+    )
+
+
+def copy_runtime_requirements(
+    dev_tools_config: DevToolsConfig,
+    build_directory_path: Path,
+) -> None:
+    if len(dev_tools_config.runtime_distributions) == 0:
+        return
+
+    plugin_package_name = dev_tools_config.plugin_package_name
+    vendor_path = build_directory_path / plugin_package_name / "_vendor"
+
+    vendor_path.mkdir(parents=True)
+    vendor_init_file = vendor_path / "__init__.py"
+    vendor_init_file.touch()
+
+    if dev_tools_config.append_distributions_to_path:
+        vendor_init_file.write_text(VENDOR_PATH_APPEND_SCRIPT)
+        insert_as_first_import(
+            build_directory_path / plugin_package_name / "__init__.py",
+            f"{plugin_package_name}._vendor",
+        )
+
+    vendored_runtime_top_level_names: list[str] = []
+
+    for vendored_distribution in (
+        dev_tools_config.runtime_distributions
+        + dev_tools_config.extra_runtime_distributions
+    ):
+        # if a recursively found dependency is provided by system packages,
+        # assume it does not have to be bundled (this is possibly dangerous,
+        # if build is made on a different system package set than runtime)
+        if (
+            vendored_distribution in dev_tools_config.extra_runtime_distributions
+            and Path(
+                vendored_distribution._path,  # type: ignore
+            ).is_relative_to(Path(sys.base_prefix))
+        ):
+            LOGGER.warning(
+                "skipping recursively found runtime requirement %s "
+                "because it is included in system packages",
+                vendored_distribution.name,
+            )
+            continue
+
+        # don't vendor plugin package, but allow to vendor other packages provided
+        # from plugin distribution. if "-e ." installs "my-plugin-name" distribution
+        # containing my_plugin & my_util_package top level packages, bundling is only
+        # needed for my_util_package
+        dist_top_level_names = get_distribution_top_level_names(vendored_distribution)
+        dist_top_level_names.discard(plugin_package_name)
+
+        LOGGER.debug(
+            "bundling runtime requirement %s with top level names %s",
+            vendored_distribution.name,
+            dist_top_level_names,
+        )
+        _copy_distribution_files(
+            vendored_distribution,
+            dist_top_level_names,
+            vendor_path,
+        )
+
+        vendored_runtime_top_level_names.extend(dist_top_level_names)
+
+    if not dev_tools_config.append_distributions_to_path:
+        for package_name in vendored_runtime_top_level_names:
+            LOGGER.debug("rewriting imports for %s", package_name)
+
+            py_files = list((build_directory_path / plugin_package_name).rglob("*.py"))
+            ui_files = list((build_directory_path / plugin_package_name).rglob("*.ui"))
+
+            for source_file in py_files + ui_files:
+                rewrite_imports_in_source_file(
+                    source_file,
+                    rewritten_package_name=package_name,
+                    container_package_name=f"{plugin_package_name}._vendor",
+                )
+
+
+def _copy_distribution_files(
+    distribution: Distribution,
+    top_level_names: set[str],
+    target_root_path: Path,
+) -> None:
+    if (file_paths := distribution.files) is None:
+        LOGGER.warning("could not resolve %s contents to bundle", distribution.name)
+        return
+
+    # bundle metadata directory first
+    distribution_metadata_path = Path(distribution._path)  # type: ignore
+    LOGGER.debug(
+        "copying %s to build directory",
+        distribution_metadata_path.resolve(),
+    )
+    shutil.copytree(
+        src=distribution_metadata_path,
+        dst=target_root_path / distribution_metadata_path.name,
+        ignore=IGNORED_FILES,
+    )
+
+    directories_to_bundle = {
+        top_directory_name
+        for file_path in file_paths
+        if len(file_path.parts) > 1
+        and (top_directory_name := file_path.parts[0]) in top_level_names
+    }
+    files_to_bundle = {
+        file_path
+        for file_path in file_paths
+        if len(file_path.parts) == 1 and file_path.stem in top_level_names
+    }
+
+    record_root_path = distribution_metadata_path.parent
+
+    for directory_path in directories_to_bundle:
+        original_path = record_root_path / directory_path
+        new_path = target_root_path / directory_path
+
+        LOGGER.debug("copying %s to build directory", original_path.resolve())
+
+        shutil.copytree(
+            src=original_path,
+            dst=new_path,
+            ignore=IGNORED_FILES,
+        )
+
+    for file_path in files_to_bundle:
+        original_path = record_root_path / file_path
+        new_path = target_root_path / file_path
+
+        LOGGER.debug("copying %s to build directory", original_path.resolve())
+
+        shutil.copy(
+            src=original_path,
+            dst=new_path,
+        )

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/build/rewrite_imports.py

@@ -19,7 +19,7 @@ class SpecialImportRewriter(ast.NodeTransformer):
     _replaced_imported_names: Dict[str, str] = field(default_factory=dict, init=False)
 
     # collect the found imported names to replace the references also
-    def visit_Import(self, node: ast.Import) -> Any:  # noqa N802
+    def visit_Import(self, node: ast.Import) -> Any:  # noqa: N802
         for alias in node.names:
             if alias.name.startswith(f"{self.from_module}.") and alias.asname is None:
                 old_module_name = alias.name
@@ -33,7 +33,7 @@ class SpecialImportRewriter(ast.NodeTransformer):
         return node
 
     # check the attributes for an imported module name reference
-    def visit_Attribute(self, node: ast.Attribute) -> Any:  # noqa N802
+    def visit_Attribute(self, node: ast.Attribute) -> Any:  # noqa: N802
         attribute_name = ast.unparse(node)
         if attribute_name in self._replaced_imported_names:
             replaced_name = self._replaced_imported_names[attribute_name]
@@ -42,7 +42,7 @@ class SpecialImportRewriter(ast.NodeTransformer):
         return self.generic_visit(node)
 
     # this will only handle sys.modules['something'] replace
-    def visit_Subscript(self, node: ast.Subscript) -> Any:  # noqa N802
+    def visit_Subscript(self, node: ast.Subscript) -> Any:  # noqa: N802
         if (
             ast.unparse(node.value) == "sys.modules"
             and isinstance(node.slice, ast.Constant)
@@ -69,7 +69,6 @@ def rewrite_imports_in_source_file(
         f'sys.modules["{rewritten_package_name}.',
     ]
     if any(special in contents for special in specials):
-
         # hold on to the original for license comments
         # since comments are lost with ast parse+unparse
         orig_file = source_file.with_name(source_file.name + "_original")

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/cli/__init__.py

@@ -21,7 +21,7 @@ import argparse
 import logging
 import sys
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 
 from importlib_metadata import entry_points
 
@@ -32,14 +32,12 @@ from qgis_plugin_dev_tools.config.dotenv import read_dotenv_configs
 from qgis_plugin_dev_tools.publish import publish_plugin_zip_file
 from qgis_plugin_dev_tools.start import launch_development_qgis
 from qgis_plugin_dev_tools.start.config import DevelopmentModeConfig
-from qgis_plugin_dev_tools.utils.distributions import (
-    get_distribution_top_level_package_names,
-)
+from qgis_plugin_dev_tools.utils.distributions import get_distribution_top_level_names
 
 LOGGER = logging.getLogger(__name__)
 
 
-def start(dotenv_file_paths: List[Path]) -> None:
+def start(dotenv_file_paths: list[Path]) -> None:
     # TODO: allow choosing pyproject file from cli?
     dev_tools_config = DevToolsConfig.from_pyproject_config(Path("pyproject.toml"))
     # TODO: allow setting debugger flag from cli?
@@ -63,13 +61,16 @@ def start(dotenv_file_paths: List[Path]) -> None:
             plugin_dependency_package_names=[
                 name
                 for dist in dev_tools_config.runtime_distributions
-                for name in get_distribution_top_level_package_names(dist)
+                for name in get_distribution_top_level_names(dist)
             ],
             debugger_library=dotenv_config.DEBUGGER_LIBRARY,
             extra_plugin_package_names=[
                 entry_point.name
                 for entry_point in entry_points_found_from_python_env
-                if entry_point.name != dev_tools_config.plugin_package_name
+                if (
+                    entry_point.name != dev_tools_config.plugin_package_name
+                    and entry_point.name not in dev_tools_config.disabled_extra_plugins
+                )
             ],
         )
     )

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/config/__init__.py

@@ -21,7 +21,6 @@ from collections import ChainMap
 from enum import Enum, auto
 from importlib.util import find_spec
 from pathlib import Path
-from typing import List
 
 from importlib_metadata import Distribution, distribution
 from packaging.requirements import Requirement
@@ -39,25 +38,27 @@ class VersionNumberSource(Enum):
         try:
             return VersionNumberSource[config_value.upper()]
         except KeyError:
-            raise ValueError(f"{config_value=} is not a valid value")
+            raise ValueError(f"{config_value=} is not a valid value") from None
 
 
 class DevToolsConfig:
     plugin_package_name: str
     plugin_package_path: Path
-    runtime_distributions: List[Distribution]
+    runtime_distributions: list[Distribution]
     changelog_file_path: Path
     append_distributions_to_path: bool
     version_number_source: VersionNumberSource
+    disabled_extra_plugins: list[str]
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         plugin_package_name: str,
-        runtime_requires: List[str],
+        runtime_requires: list[str],
         changelog_file_path: Path,
         append_distributions_to_path: bool,
         auto_add_recursive_runtime_dependencies: bool,
-        version_number_source: VersionNumberSource = VersionNumberSource.CHANGELOG,
+        version_number_source: VersionNumberSource,
+        disabled_extra_plugins: list[str],
     ) -> None:
         plugin_package_spec = find_spec(plugin_package_name)
         if plugin_package_spec is None or plugin_package_spec.origin is None:
@@ -75,6 +76,7 @@ class DevToolsConfig:
         self.append_distributions_to_path = append_distributions_to_path
         self.version_number_source = version_number_source
         self.extra_runtime_distributions = []
+        self.disabled_extra_plugins = disabled_extra_plugins
 
         if auto_add_recursive_runtime_dependencies:
             # Add the requirements of the distributions as well
@@ -109,4 +111,5 @@ class DevToolsConfig:
             version_number_source=VersionNumberSource.from_config_value(
                 pyproject_config.version_number_source
             ),
+            disabled_extra_plugins=pyproject_config.disabled_extra_plugins,
         )

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/config/dotenv.py

@@ -19,14 +19,14 @@
 
 import logging
 from pathlib import Path
-from typing import Dict, List, Optional
+from typing import Optional
 
 from dotenv import dotenv_values
 
 LOGGER = logging.getLogger(__name__)
 
 
-class DotenvConfig:  # noqa SIM119
+class DotenvConfig:
     """
     Expected structure for the config keys in the .env.
     """
@@ -34,14 +34,14 @@ class DotenvConfig:  # noqa SIM119
     QGIS_EXECUTABLE_PATH: Path
     DEBUGGER_LIBRARY: Optional[str]
     DEVELOPMENT_PROFILE_NAME: Optional[str]
-    runtime_environment: Dict[str, str]
+    runtime_environment: dict[str, str]
 
     def __init__(
         self,
         *,
-        QGIS_EXECUTABLE_PATH: str,  # noqa N803
-        DEBUGGER_LIBRARY: Optional[str] = None,  # noqa N803
-        DEVELOPMENT_PROFILE_NAME: Optional[str] = None,  # noqa N803
+        QGIS_EXECUTABLE_PATH: str,  # noqa: N803
+        DEBUGGER_LIBRARY: Optional[str] = None,  # noqa: N803
+        DEVELOPMENT_PROFILE_NAME: Optional[str] = None,  # noqa: N803
         **other_vars: str,
     ) -> None:
         self.QGIS_EXECUTABLE_PATH = Path(QGIS_EXECUTABLE_PATH)
@@ -54,7 +54,7 @@ class DotenvConfig:  # noqa SIM119
         self.runtime_environment = other_vars
 
 
-def read_dotenv_configs(dotenv_file_paths: List[Path]) -> DotenvConfig:
+def read_dotenv_configs(dotenv_file_paths: list[Path]) -> DotenvConfig:
     config = {}
     for dotenv_file_path in dotenv_file_paths:
         LOGGER.debug("reading config from %s", dotenv_file_path.resolve())
@@ -62,4 +62,4 @@ def read_dotenv_configs(dotenv_file_paths: List[Path]) -> DotenvConfig:
     try:
         return DotenvConfig(**{k: v for k, v in config.items() if v})
     except (KeyError, TypeError) as e:
-        raise ValueError(f"dev tools config invalid in .env: {e}")
+        raise ValueError(f"dev tools config invalid in .env: {e}") from e

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/config/pyproject.py

@@ -20,7 +20,7 @@
 import logging
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import List, Literal, Union
+from typing import Literal, Union
 
 import tomli
 
@@ -36,12 +36,13 @@ class PyprojectConfig:
     DEV_TOOLS_SECTION_LOCATOR = "qgis_plugin_dev_tools"
 
     plugin_package_name: str
-    runtime_requires: List[str] = field(default_factory=list)
+    runtime_requires: list[str] = field(default_factory=list)
     use_dangerous_vendor_sys_path_append: bool = False
     auto_add_recursive_runtime_dependencies: bool = False
     version_number_source: Union[
         Literal["changelog"], Literal["distribution"]
     ] = "changelog"
+    disabled_extra_plugins: list[str] = field(default_factory=list)
 
     def __post_init__(self) -> None:
         if self.version_number_source not in ["changelog", "distribution"]:
@@ -60,4 +61,4 @@ def read_pyproject_config(pyproject_file_path: Path) -> PyprojectConfig:
             ]
             return PyprojectConfig(**dev_tools_configuration)
         except (KeyError, TypeError) as e:
-            raise ValueError(f"dev tools config invalid in pyproject.toml: {e}")
+            raise ValueError(f"dev tools config invalid in pyproject.toml: {e}") from e

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/publish/__init__.py

@@ -4,13 +4,15 @@ import logging
 import os
 from base64 import b64encode
 from pathlib import Path
-from typing import Dict, Tuple, cast
+from typing import cast
 from uuid import uuid4
 
 import requests
 
 LOGGER = logging.getLogger(__name__)
 
+HTTP_STATUS_CODE_OK = 200
+
 
 def publish_plugin_zip_file(plugin_zip_file_path: Path) -> None:
     username = os.environ.get("QPDT_PUBLISH_USERNAME")
@@ -51,7 +53,7 @@ def publish_plugin_zip_file(plugin_zip_file_path: Path) -> None:
         response.text,
     )
 
-    if response.status_code != 200:
+    if response.status_code != HTTP_STATUS_CODE_OK:
         raise Exception(
             "QGIS plugin repository plugin upload "
             f"HTTP request failed with status {response.status_code}"
@@ -62,7 +64,7 @@ def publish_plugin_zip_file(plugin_zip_file_path: Path) -> None:
             f"request returned error response {response.json().get('error')}"
         )
 
-    plugin_id, version_id = cast(Dict[str, Tuple[int, int]], response.json()).get(
+    plugin_id, version_id = cast(dict[str, tuple[int, int]], response.json()).get(
         "result", (None, None)
     )
 

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/start/__init__.py

@@ -32,13 +32,11 @@ def launch_development_qgis(
 ) -> None:
     LOGGER.info("starting daemon server")
     with start_daemon_server() as (port, handle_single_request):
-
         LOGGER.info("creating a bootstrap file")
         with create_bootstrap_file(
             development_mode_config,
             port,
         ) as bootstrap_file_path:
-
             LOGGER.info("launching qgis")
             launch_qgis_with_bootstrap_script(
                 development_mode_config.qgis_executable_path,

{qgis-plugin-dev-tools-0.6.2 → qgis_plugin_dev_tools-0.7.0}/src/qgis_plugin_dev_tools/start/bootstrap/__init__.py

@@ -21,11 +21,11 @@ import dataclasses
 import logging
 import pickle
 import sys
+from collections.abc import Generator
 from contextlib import contextmanager
 from importlib import resources
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import Generator
 
 from qgis_plugin_dev_tools.start.bootstrap.template import BootstrapConfig
 from qgis_plugin_dev_tools.start.config import DevelopmentModeConfig
@@ -44,10 +44,10 @@ def create_bootstrap_file(
             runtime_environment=development_mode_configuration.runtime_environment,
             plugin_package_path=development_mode_configuration.plugin_package_path,
             plugin_package_name=development_mode_configuration.plugin_package_name,
-            plugin_dependency_package_names=development_mode_configuration.plugin_dependency_package_names,  # noqa E501
+            plugin_dependency_package_names=development_mode_configuration.plugin_dependency_package_names,
             debugger_library=development_mode_configuration.debugger_library,
             bootstrap_python_executable_path=Path(sys.executable),
-            extra_plugin_package_names=development_mode_configuration.extra_plugin_package_names,  # noqa E501
+            extra_plugin_package_names=development_mode_configuration.extra_plugin_package_names,
         )
 
         LOGGER.debug("using bootstrap config:\n%s", bootstrap_config)