From 991cae7e8d9cf6e5705159467823002ee98930b6 Mon Sep 17 00:00:00 2001 From: Christian Manivong Date: Fri, 23 Oct 2026 12:08:18 +0200 Subject: [PATCH 1/3] style: ruff format and the lint rules of the driver standard Mechanical: ruff format, and ruff check --fix with the rule set every NAPALM driver uses (E, F, I, UP, B at line length 100, Python 3.10). What ruff cannot fix comes in the next commit. --- pyproject.toml | 10 ++++++---- tests/test_qnap_qts.py | 8 +++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bfd36f2..122ce48 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,9 +73,11 @@ testpaths = ["tests"] [tool.ruff] line-length = 100 -target-version = "py39" +target-version = "py310" -# Same rule set the netOrk repo gates on, so this driver is held to the -# standard of the project that consumes it rather than to ruff's defaults. [tool.ruff.lint] -select = ["E", "F", "I", "UP"] +select = ["E", "F", "I", "UP", "B"] + +[tool.ruff.lint.per-file-ignores] +# Recorded device output keeps its lines. +"tests/**" = ["E501"] diff --git a/tests/test_qnap_qts.py b/tests/test_qnap_qts.py index b0870f6..34da812 100644 --- a/tests/test_qnap_qts.py +++ b/tests/test_qnap_qts.py @@ -105,9 +105,7 @@ class TestRolesDoNotShadowLinux: owner = next(k for k in QnapQtsDriver.__mro__ if method in k.__dict__) assert owner is LinuxDriver - @pytest.mark.parametrize( - "method", ["get_packages", "install_package", "uninstall_package"] - ) + @pytest.mark.parametrize("method", ["get_packages", "install_package", "uninstall_package"]) def test_package_surface_is_refused_deliberately(self, method): """QTS has no apt/dnf, so LinuxDriver's versions must not be inherited silently -- this driver overrides them to refuse.""" @@ -117,7 +115,8 @@ class TestRolesDoNotShadowLinux: def test_no_forwarding_methods_remain(self): """A forwarder here would mean the shadowing came back.""" own = { - name for name, val in vars(QnapQtsDriver).items() + name + for name, val in vars(QnapQtsDriver).items() if callable(val) and not name.startswith("__") } assert "get_services" not in own @@ -216,7 +215,6 @@ def test_services_cannot_be_controlled(): assert not callable(getattr(QnapQtsDriver, "manage_service", None)) - def test_updates_are_not_read_or_applied_here(): """QTS has no apt, dnf or opkg: the readers inherited from LinuxDriver find no package manager, and QPKG updates are not implemented. Saying so keeps QNAP out -- 2.54.0 From dd785da94f96012c3bd6ecb1a01e4900c2915e22 Mon Sep 17 00:00:00 2001 From: Christian Manivong Date: Fri, 23 Oct 2026 12:09:52 +0200 Subject: [PATCH 2/3] chore: adopt the NAPALM driver standard - CI moves to .gitea/workflows/ci.yml and calls the shared driver workflow of NAPALM/driver-standard; napalm-device-types and napalm-linux come from git until napalm-linux 0.15.0 is on PyPI. - requires-python >=3.10 (napalm-device-types needs it), SPDX license string, setuptools>=77, LICENSE file, py.typed, Issues and Changelog links. - Dependencies: napalm-device-types>=4.22.0, napalm-linux>=0.15.0; the floors napalm>=4.0, netmiko>=4.0.0 and paramiko>=5.0.0 stay and pass the tests at exactly those versions. The dev extra gets floors and drops black (ruff formats). - mypy strict for the whole package, no exempt module. install_package and uninstall_package keep napalm-device-types' PackagesMixin signatures, which LinuxDriver's differ from: type: ignore[override] on those two lines, with the reason above them. - Coverage floor 76 % (measured 76.19 %); the quality baseline is empty apart from it. --- .gitea/workflows/ci.yml | 17 ++++ .github/workflows/ci.yml | 50 ---------- CHANGELOG.md | 8 ++ LICENSE | 191 ++++++++++++++++++++++++++++++++++++ napalm_qnap_qts/py.typed | 0 napalm_qnap_qts/qnap_qts.py | 6 +- pyproject.toml | 42 +++++--- tests/quality_baseline.json | 8 ++ 8 files changed, 256 insertions(+), 66 deletions(-) create mode 100644 .gitea/workflows/ci.yml delete mode 100644 .github/workflows/ci.yml create mode 100644 LICENSE create mode 100644 napalm_qnap_qts/py.typed create mode 100644 tests/quality_baseline.json diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml new file mode 100644 index 0000000..8a28be9 --- /dev/null +++ b/.gitea/workflows/ci.yml @@ -0,0 +1,17 @@ +name: CI + +on: + push: + branches: [main, master] + tags: ["v*"] + pull_request: + +jobs: + driver: + uses: NAPALM/driver-standard/.gitea/workflows/driver.yml@main + with: + standard-ref: main + # Until napalm-linux 0.15.0 is on PyPI. + pre-install: "git+https://git.netork.io/NAPALM/napalm-device-types.git git+https://git.netork.io/NAPALM/napalm-linux.git" + secrets: + PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 5533e6c..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: CI - -on: - push: - branches: ["**"] - pull_request: - branches: ["**"] - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ["3.10", "3.11", "3.12"] - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - cache: pip - - - name: Install package with dev extras - run: | - python -m pip install --upgrade pip - # napalm-device-types lives in git.netork.io/NAPALM, not on PyPI: without this - # pip looks there, finds an unrelated 0.1.0 and the job dies before any test. - python -m pip install "napalm-device-types @ git+https://git.netork.io/NAPALM/napalm-device-types.git" - # napalm-linux, which this driver builds on, is not on PyPI either. - python -m pip install "napalm-linux @ git+https://git.netork.io/NAPALM/napalm-linux.git" - python -m pip install -e ".[dev]" - - - name: Run unit tests - run: | - python -m pytest -q --tb=short - - - name: Build wheel and sdist - run: | - python -m pip install build - python -m build - - - name: Upload dist artifacts - # v4 refuses to run on Gitea ("not currently supported on GHES"). - uses: actions/upload-artifact@v3 - with: - name: dist-${{ matrix.python-version }} - path: dist/* \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index bc3e15d..21eac80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- The driver follows the NAPALM driver standard + (https://git.netork.io/NAPALM/driver-standard): CI on Gitea runs ruff, mypy, the + tests on Python 3.10–3.13 and at the lowest declared versions, bandit, pip-audit and + a build check, and a release tag publishes to PyPI. The package now ships `py.typed` + and a LICENSE file. It needs napalm-device-types 4.22.0 and napalm-linux 0.15.0. + **Python 3.9 is no longer supported**; napalm-device-types never ran on it. + ## [0.4.0] – 2026-10-17 ### Changed diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..68d39ec --- /dev/null +++ b/LICENSE @@ -0,0 +1,191 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship made available under + the License, as indicated by a copyright notice that is included in + or attached to the work (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other transformations + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean, as submitted to the Licensor for inclusion + in the Work by the copyright owner or by an individual or Legal Entity + authorized to submit on behalf of the copyright owner. For the purposes + of this definition, "submitted" means any form of electronic, verbal, + or written communication sent to the Licensor or its representatives, + including but not limited to communication on electronic mailing lists, + source code control systems, and issue tracking systems that are managed + by, or on behalf of, the Licensor for the purpose of discussing and + improving the Work, but excluding communication that is conspicuously + marked or designated in writing by the copyright owner as "Not a + Contribution." + + "Contributor" shall mean Licensor and any Legal Entity on behalf of + whom a Contribution has been received by the Licensor and incorporated + within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by the combined Contribution(s) and the Work + to which such Contribution(s) was submitted. If You institute patent + litigation against any entity (including a cross-claim or counterclaim + in a lawsuit) alleging that the Work or any Contribution embodied + within the Work constitutes direct or contributory patent infringement, + then any patent licenses granted to You under this License for that + Work shall terminate as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative + Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, You must include a readable copy of the + attribution notices contained within such NOTICE file, in + at least one of the following places: within a NOTICE text file + distributed as part of the Derivative Works; within the Source + form or documentation, if provided along with the Derivative + Works; or, within a display generated by the Derivative Works, + if and wherever such third-party notices normally appear. The + contents of the NOTICE file are for informational purposes only + and do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own license statement for Your modifications and + may provide additional grant of rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Work, + and to permit persons to whom the Work is furnished to do so, + subject to the following conditions: + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any conditions of TITLE, + MERCHANTIBILITY, or FITNESS FOR A PARTICULAR PURPOSE. + See the License for the specific language governing permissions and + limitations under the License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or exemplary damages of any character arising as a + result of this License or out of the use or inability to use the + Work (even if such Contributor has been advised of the possibility + of such damages). + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may offer only + conditions consistent with this License, subject to the following + additional conditions: + + (a) You may offer additional warranty, indemnity, or other liability + terms and conditions; and + + (b) You may offer support for the Work in return for a fee. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format in question. It may also be + possible to make it available with a creative commons license. + + Copyright 2026 Christian Manivong + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/napalm_qnap_qts/py.typed b/napalm_qnap_qts/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/napalm_qnap_qts/qnap_qts.py b/napalm_qnap_qts/qnap_qts.py index 2036efd..9fcd80e 100644 --- a/napalm_qnap_qts/qnap_qts.py +++ b/napalm_qnap_qts/qnap_qts.py @@ -177,8 +177,10 @@ class QnapQtsDriver(StorageDriver, HypervisorDriver, LinuxDriver): "QTS uses QPKG, not a Linux package manager; QPKG parsing is not implemented yet" ) - def install_package(self, name: str, version: str = "") -> None: + # These two keep napalm-device-types' PackagesMixin signatures; LinuxDriver's + # own differ from that contract (no version, a purge flag, a dict returned). + def install_package(self, name: str, version: str = "") -> None: # type: ignore[override] raise NotImplementedError("QPKG install is not implemented yet") - def uninstall_package(self, name: str) -> None: + def uninstall_package(self, name: str) -> None: # type: ignore[override] raise NotImplementedError("QPKG removal is not implemented yet") diff --git a/pyproject.toml b/pyproject.toml index 122ce48..97cc968 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=68", "wheel"] +requires = ["setuptools>=77"] build-backend = "setuptools.build_meta" [project] @@ -7,8 +7,8 @@ name = "napalm-qnap-qts" version = "0.5.0" description = "NAPALM driver for QNAP NAS systems running QTS via SSH" readme = "README.md" -requires-python = ">=3.9" -license = { text = "Apache-2.0" } +requires-python = ">=3.10" +license = "Apache-2.0" authors = [ { name = "Christian Manivong", email = "christian@manivong.de" }, ] @@ -27,13 +27,12 @@ classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "Intended Audience :: System Administrators", - "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: System :: Networking", "Topic :: System :: Systems Administration", "Typing :: Typed", @@ -43,31 +42,30 @@ classifiers = [ # processes, Docker) from LinuxDriver rather than reimplementing it. dependencies = [ "napalm>=4.0", - "napalm-device-types>=2.6.0", - "napalm-linux>=0.9.0", + "napalm-device-types>=4.22.0", + "napalm-linux>=0.15.0", "netmiko>=4.0.0", "paramiko>=5.0.0", # CVE-2026-44405 ] [project.optional-dependencies] -dev = [ - "pytest", - "pytest-cov", - "black", - "ruff", - "mypy", -] +dev = ["pytest>=8", "pytest-cov>=5", "mypy>=1.11", "ruff>=0.6"] [project.entry-points."napalm.drivers"] qnap_qts = "napalm_qnap_qts:QnapQtsDriver" [project.urls] Repository = "https://git.netork.io/NAPALM/napalm-qnap-qts" +Issues = "https://git.netork.io/NAPALM/napalm-qnap-qts/issues" +Changelog = "https://git.netork.io/NAPALM/napalm-qnap-qts/src/branch/main/CHANGELOG.md" [tool.setuptools.packages.find] where = ["."] include = ["napalm_qnap_qts*"] +[tool.setuptools.package-data] +napalm_qnap_qts = ["py.typed"] + [tool.pytest.ini_options] testpaths = ["tests"] @@ -81,3 +79,19 @@ select = ["E", "F", "I", "UP", "B"] [tool.ruff.lint.per-file-ignores] # Recorded device output keeps its lines. "tests/**" = ["E501"] + +[tool.mypy] +python_version = "3.10" +strict = true +# napalm itself is untyped, so every driver subclasses Any. +disallow_subclassing_any = false + +[[tool.mypy.overrides]] +module = ["napalm.*", "netmiko.*", "paramiko.*"] +ignore_missing_imports = true + +[tool.coverage.run] +source = ["napalm_qnap_qts"] + +[tool.coverage.report] +fail_under = 76 diff --git a/tests/quality_baseline.json b/tests/quality_baseline.json new file mode 100644 index 0000000..0f9438c --- /dev/null +++ b/tests/quality_baseline.json @@ -0,0 +1,8 @@ +{ + "coverage_floor": 76.0, + "function_complexity": {}, + "function_lines": {}, + "mypy_relaxed": [], + "python_file_lines": {}, + "untyped_public": [] +} -- 2.54.0 From 0cf719e6deedc2f4a75fd72ac51e91a83993257d Mon Sep 17 00:00:00 2001 From: Christian Manivong Date: Fri, 23 Oct 2026 16:01:57 +0200 Subject: [PATCH 3/3] chore(release): 0.6.0 --- CHANGELOG.md | 4 ++++ pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21eac80..8c90a82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.6.0] - 2026-10-23 + +The first release on PyPI. + ### Changed - The driver follows the NAPALM driver standard (https://git.netork.io/NAPALM/driver-standard): CI on Gitea runs ruff, mypy, the diff --git a/pyproject.toml b/pyproject.toml index 97cc968..0ddc24d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "napalm-qnap-qts" -version = "0.5.0" +version = "0.6.0" description = "NAPALM driver for QNAP NAS systems running QTS via SSH" readme = "README.md" requires-python = ">=3.10" -- 2.54.0