From eb3f92f2dd741ac61901589f5eb23becaefa67c7 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Fri, 3 Jul 2026 22:22:47 +0200 Subject: [PATCH 1/2] Bumped dependencies. --- dist/requirements.txt | 2 +- doc/Dependency.rst | 22 +++++++++++----------- doc/requirements.txt | 6 +++--- pyproject.toml | 7 +++---- requirements.txt | 2 +- tests/typing/requirements.txt | 6 +++--- tests/unit/requirements.txt | 4 ++-- 7 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dist/requirements.txt b/dist/requirements.txt index e87980b..e0dde03 100644 --- a/dist/requirements.txt +++ b/dist/requirements.txt @@ -1,2 +1,2 @@ -wheel ~= 0.45.0 +wheel ~= 0.47.0 twine ~= 6.2 diff --git a/doc/Dependency.rst b/doc/Dependency.rst index 0785ee8..2a064b8 100644 --- a/doc/Dependency.rst +++ b/doc/Dependency.rst @@ -52,7 +52,7 @@ When installed as ``pySystemRDLModel``: +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +========================================================+=============+==========================================================================================+=================================================================================================================================+ -| `pyTooling `__ | ≥8.11 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.15 | `Apache License, 2.0 `__ | *None* | +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+ @@ -96,15 +96,15 @@ the mandatory dependencies too. +=====================================================================+=============+========================================================================================+======================+ | `pytest `__ | ≥9.0 | `MIT `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `pytest-cov `__ | ≥7.0 | `MIT `__ | *Not yet evaluated.* | +| `pytest-cov `__ | ≥7.1 | `MIT `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `Coverage `__ | ≥7.13 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +| `Coverage `__ | ≥7.15 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `mypy `__ | ≥1.19 | `MIT `__ | *Not yet evaluated.* | +| `mypy `__ | ≥2.1 | `MIT `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `typing-extensions `__ | ≥4.15 | `PSF-2.0 `__ | *Not yet evaluated.* | +| `typing-extensions `__ | ≥4.16 | `PSF-2.0 `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `lxml `__ | ≥6.0 | `BSD 3-Clause `__ | *Not yet evaluated.* | +| `lxml `__ | ≥6.1 | `BSD 3-Clause `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ @@ -144,7 +144,7 @@ the mandatory dependencies too. +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +=================================================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥8.11 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.15 | `Apache License, 2.0 `__ | *None* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | `Sphinx `__ | ≥9.1 | `BSD 3-Clause `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -158,7 +158,7 @@ the mandatory dependencies too. +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | `sphinx-copybutton `__ | ≥0.5 | `MIT `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ -| `sphinx_autodoc_typehints `__ | ≥3.6 | `MIT `__ | *Not yet evaluated.* | +| `sphinx_autodoc_typehints `__ | ≥3.12 | `MIT `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -198,9 +198,9 @@ install the mandatory dependencies too. +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +============================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥8.11 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.15 | `Apache License, 2.0 `__ | *None* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ -| `wheel `__ | ≥0.45 | `MIT `__ | *Not yet evaluated.* | +| `wheel `__ | ≥0.47 | `MIT `__ | *Not yet evaluated.* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -241,7 +241,7 @@ install the mandatory dependencies too. +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ | **Package** | **Version** | **License** | **Dependencies** | +==========================================================+==============+===========================================================================================+======================+ -| `wheel `__ | ≥0.45 | `MIT `__ | *Not yet evaluated.* | +| `wheel `__ | ≥0.47 | `MIT `__ | *Not yet evaluated.* | +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ | `Twine `__ | ≥6.2 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ diff --git a/doc/requirements.txt b/doc/requirements.txt index 6fbda0f..96ab3f4 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -12,6 +12,6 @@ sphinx_rtd_theme ~= 3.1 sphinxcontrib-mermaid ~= 2.0 autoapi >= 2.0.1 sphinx_design ~= 0.7.0 -sphinx-copybutton >= 0.5.0 -sphinx_autodoc_typehints ~= 3.6 -sphinx_reports ~= 0.10.0 +sphinx-copybutton >= 0.5.2 +sphinx_autodoc_typehints ~= 3.12 +sphinx_reports ~= 0.11.0 diff --git a/pyproject.toml b/pyproject.toml index 05f22bb..af5a476 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,7 @@ [build-system] requires = [ - "setuptools >= 80.0", - "wheel ~= 0.45.0", - "pyTooling ~= 8.11" + "setuptools >= 82.0", + "pyTooling ~= 8.15" ] build-backend = "setuptools.build_meta" @@ -26,7 +25,7 @@ variable-naming-style = "camelCase" [tool.mypy] packages = ["pySystemRDLModel"] -python_version = "3.13" +python_version = "3.14" #ignore_missing_imports = true strict = true pretty = true diff --git a/requirements.txt b/requirements.txt index 06414d4..82b41f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pyTooling ~= 8.11 +pyTooling ~= 8.15 diff --git a/tests/typing/requirements.txt b/tests/typing/requirements.txt index 95ab13e..cde824b 100644 --- a/tests/typing/requirements.txt +++ b/tests/typing/requirements.txt @@ -1,6 +1,6 @@ -r ../../requirements.txt # Static Type Checking -mypy[reports] ~= 1.19 -typing_extensions ~= 4.15 -lxml >= 5.4, <7.0 +mypy[reports] ~= 2.1 +typing_extensions ~= 4.16 +lxml >= 6.1 , <7.0 diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt index a2ffbaa..1084f8f 100644 --- a/tests/unit/requirements.txt +++ b/tests/unit/requirements.txt @@ -1,8 +1,8 @@ -r ../../requirements.txt # Coverage collection -Coverage ~= 7.13 +Coverage ~= 7.15 # Test Runner pytest ~= 9.0 -pytest-cov ~= 7.0 +pytest-cov ~= 7.1 From 1966f9add9e74277e749f262dac35c14f34d240e Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Fri, 3 Jul 2026 22:23:11 +0200 Subject: [PATCH 2/2] Fixed URLs in shields. --- README.md | 8 ++++---- doc/index.rst | 11 ++--------- doc/shields.inc | 8 ++++---- pySystemRDLModel/__init__.py | 2 +- run.ps1 | 2 +- 5 files changed, 12 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 9ef2b8c..7fe546f 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@

-[![Sourcecode on GitHub](https://img.shields.io/badge/pyEDAA-pySystemRDLModel-29b6f6.svg?longCache=true&style=flat-square&logo=GitHub&labelColor=0277bd)](https://GitHub.com/edaa-org/pySystemRDLModel) +[![Sourcecode on GitHub](https://img.shields.io/badge/pyEDAA-pySystemRDLModel-29b6f6?longCache=true&style=flat-square&logo=GitHub&labelColor=0277bd)](https://GitHub.com/edaa-org/pySystemRDLModel) [![Sourcecode License](https://img.shields.io/pypi/l/pySystemRDLModel?longCache=true&style=flat-square&logo=Apache&label=code)](LICENSE.md) [![Documentation](https://img.shields.io/website?longCache=true&style=flat-square&label=edaa-org.github.io%2FpySystemRDLModel&logo=GitHub&logoColor=fff&up_color=blueviolet&up_message=Read%20now%20%E2%9E%9A&url=https%3A%2F%2Fedaa-org.github.io%2FpySystemRDLModel%2Findex.html)](https://edaa-org.github.io/pySystemRDLModel/) -[![Documentation License](https://img.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff)](LICENSE.md) -[![Gitter](https://img.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef)](https://gitter.im/hdl/community) +[![Documentation License](https://img.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff)](doc/Doc-License.rst) +[![Gitter](https://img.shields.io/badge/chat-on%20gitter-4db797?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef)](https://gitter.im/hdl/community) [![PyPI](https://img.shields.io/pypi/v/pySystemRDLModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)](https://pypi.org/project/pySystemRDLModel/) ![PyPI - Status](https://img.shields.io/pypi/status/pySystemRDLModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pySystemRDLModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072) @@ -59,7 +59,7 @@ and services on such a model, while supporting multiple frontends. # License -This Python package (source code) licensed under [Apache License 2.0](LICENSE.md). +This Python package (source code) is licensed under [Apache License 2.0](LICENSE.md). The accompanying documentation is licensed under [Creative Commons - Attribution 4.0 (CC-BY 4.0)](doc/Doc-License.rst). ------------------------- diff --git a/doc/index.rst b/doc/index.rst index 7a9251e..0221da4 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -87,15 +87,8 @@ Contributors License ******* -.. only:: html - - This Python package (source code) is licensed under `Apache License 2.0 `__. |br| - The accompanying documentation is licensed under `Creative Commons - Attribution 4.0 (CC-BY 4.0) `__. - -.. only:: latex - - This Python package (source code) is licensed under **Apache License 2.0**. |br| - The accompanying documentation is licensed under **Creative Commons - Attribution 4.0 (CC-BY 4.0)**. +This Python package (source code) is licensed under :ref:`Apache License 2.0 `. |br| +The accompanying documentation is licensed under :ref:`Creative Commons - Attribution 4.0 (CC-BY 4.0) `. .. toctree:: diff --git a/doc/shields.inc b/doc/shields.inc index 8e4febb..489fe88 100644 --- a/doc/shields.inc +++ b/doc/shields.inc @@ -4,11 +4,11 @@ # percent encoding so that the URL is properly parsed. .. # Sourcecode link to GitHub -.. |SHIELD:svg:pySystemRDLModel-github| image:: https://img.shields.io/badge/pyEDAA-pySystemRDLModel-29b6f6.svg?longCache=true&style=flat-square&logo=GitHub&labelColor=0277bd +.. |SHIELD:svg:pySystemRDLModel-github| image:: https://img.shields.io/badge/pyEDAA-pySystemRDLModel-29b6f6?longCache=true&style=flat-square&logo=GitHub&labelColor=0277bd :alt: Sourcecode on GitHub :height: 22 :target: https://GitHub.com/edaa-org/pySystemRDLModel -.. |SHIELD:png:pySystemRDLModel-github| image:: https://raster.shields.io/badge/pyEDAA-pySystemRDLModel-29b6f6.svg?longCache=true&style=flat-square&logo=GitHub&labelColor=0277bd +.. |SHIELD:png:pySystemRDLModel-github| image:: https://raster.shields.io/badge/pyEDAA-pySystemRDLModel-29b6f6?longCache=true&style=flat-square&logo=GitHub&labelColor=0277bd :alt: Sourcecode on GitHub :height: 22 :target: https://GitHub.com/edaa-org/pySystemRDLModel @@ -180,11 +180,11 @@ :target: https://edaa-org.github.io/pySystemRDLModel/ .. # Gitter -.. |SHIELD:svg:pySystemRDLModel-gitter| image:: https://img.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef +.. |SHIELD:svg:pySystemRDLModel-gitter| image:: https://img.shields.io/badge/chat-on%20gitter-4db797?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef :alt: Documentation License :height: 22 :target: https://gitter.im/hdl/community -.. |SHIELD:png:pySystemRDLModel-gitter| image:: https://raster.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef +.. |SHIELD:png:pySystemRDLModel-gitter| image:: https://raster.shields.io/badge/chat-on%20gitter-4db797?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef :alt: Documentation License :height: 22 :target: https://gitter.im/hdl/community diff --git a/pySystemRDLModel/__init__.py b/pySystemRDLModel/__init__.py index fe06f9f..9d2fe15 100644 --- a/pySystemRDLModel/__init__.py +++ b/pySystemRDLModel/__init__.py @@ -52,7 +52,7 @@ __email__ = "Paebbels@gmail.com" __copyright__ = "2023-2026, Patrick Lehmann" __license__ = "Apache License, Version 2.0" -__version__ = "0.3.8" +__version__ = "0.3.9" @export diff --git a/run.ps1 b/run.ps1 index e91d643..4d8e3f3 100644 --- a/run.ps1 +++ b/run.ps1 @@ -33,7 +33,7 @@ Param( ) $PackageName = "pySystemRDLModel" -$PackageVersion = "0.3.8" +$PackageVersion = "0.3.9" # set default values $EnableDebug = [bool]$PSCmdlet.MyInvocation.BoundParameters["Debug"]