From 5d9ece00e9cfd742c2d1c270bde2c5e4956ecb1d Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Mon, 22 Jun 2026 07:58:08 +0200 Subject: [PATCH 1/3] Bumped dependencies. --- dist/requirements.txt | 2 +- doc/Dependency.rst | 22 +++++++++++----------- doc/requirements.txt | 6 +++--- pyproject.toml | 3 +-- requirements.txt | 4 ++-- tests/typing/requirements.txt | 2 +- tests/unit/requirements.txt | 4 ++-- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dist/requirements.txt b/dist/requirements.txt index e87980bd..fc810d11 100644 --- a/dist/requirements.txt +++ b/dist/requirements.txt @@ -1,2 +1,2 @@ -wheel ~= 0.45.0 +wheel ~= 0.46.3 twine ~= 6.2 diff --git a/doc/Dependency.rst b/doc/Dependency.rst index 690cfb01..6d024bf3 100644 --- a/doc/Dependency.rst +++ b/doc/Dependency.rst @@ -50,9 +50,9 @@ PyPI (see :ref:`INSTALL`). +---------------------------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +=======================================================================================+=============+==========================================================================================================+=============================================================================================================================================================+ -| `pyTooling `__ | ≥8.11 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.14 | `Apache License, 2.0 `__ | *None* | +---------------------------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| `pyVHDLModel `__ | ≥0.33 | `Apache License, 2.0 `__ | * `pyTooling `__ (`Apache License, 2.0 `__) | +| `pyVHDLModel `__ | ≥0.34 | `Apache License, 2.0 `__ | * `pyTooling `__ (`Apache License, 2.0 `__) | +---------------------------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+ | `pySVModel `__ | ≥0.3.1 | `Apache License, 2.0 `__ | * `pyTooling `__ (`Apache License, 2.0 `__) | +---------------------------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -100,11 +100,11 @@ 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.14 | `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.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ @@ -149,7 +149,7 @@ the mandatory dependencies too. +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +=================================================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥8.11 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.14 | `Apache License, 2.0 `__ | *None* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | `Sphinx `__ | ≥9.1 | `BSD 3-Clause `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -163,11 +163,11 @@ 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.10 | `MIT `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | `ruamel.yaml `__ | ≥0.19 | `MIT `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ -| `sphinx_reports `__ | ≥0.10 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +| `sphinx_reports `__ | ≥0.11 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ .. _DEP/packaging: @@ -206,9 +206,9 @@ install the mandatory dependencies too. +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +============================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥8.11 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.14 | `Apache License, 2.0 `__ | *None* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ -| `wheel `__ | ≥0.45 | `MIT `__ | *Not yet evaluated.* | +| `wheel `__ | ≥0.46 | `MIT `__ | *Not yet evaluated.* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -249,7 +249,7 @@ install the mandatory dependencies too. +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ | **Package** | **Version** | **License** | **Dependencies** | +==========================================================+==============+===========================================================================================+======================+ -| `wheel `__ | ≥0.45 | `MIT `__ | *Not yet evaluated.* | +| `wheel `__ | ≥0.46 | `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 6fbda0f4..97d0da84 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.10 +sphinx_reports ~= 0.11.0 diff --git a/pyproject.toml b/pyproject.toml index 5315bd31..2a44cf88 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,7 @@ [build-system] requires = [ "setuptools >= 80.0", - "wheel ~= 0.45.0", - "pyTooling ~= 8.11" + "pyTooling ~= 8.14" ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index c8d11bc2..b1f5b5da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pyTooling ~= 8.11 -pyVHDLModel ~= 0.33.0 +pyTooling ~= 8.15 +pyVHDLModel ~= 0.35.0 pySVModel ~= 0.5.0 pySystemRDLModel ~= 0.3.0 diff --git a/tests/typing/requirements.txt b/tests/typing/requirements.txt index 95ab13e1..f1c46bb8 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 +mypy[reports] ~= 2.1 typing_extensions ~= 4.15 lxml >= 5.4, <7.0 diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt index a2ffbaa9..9d5f7fb7 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.14 # Test Runner pytest ~= 9.0 -pytest-cov ~= 7.0 +pytest-cov ~= 7.1 From 371affa7774e3859179b9e8d054d0f032adae825 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Mon, 22 Jun 2026 07:58:35 +0200 Subject: [PATCH 2/3] Documentation fixes. --- README.md | 8 ++++---- doc/index.rst | 11 ++--------- doc/shields.inc | 8 ++++---- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 46649b1d..1ea3d059 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@

-[![Sourcecode on GitHub](https://img.shields.io/badge/pyEDAA-ProjectModel-ab47bc.svg?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a)](https://GitHub.com/edaa-org/pyEDAA.ProjectModel) +[![Sourcecode on GitHub](https://img.shields.io/badge/pyEDAA-ProjectModel-ab47bc?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a)](https://GitHub.com/edaa-org/pyEDAA.ProjectModel) [![Sourcecode License](https://img.shields.io/pypi/l/pyEDAA.ProjectModel?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%2FpyEDAA.ProjectModel&logo=GitHub&logoColor=fff&up_color=blueviolet&up_message=Read%20now%20%E2%9E%9A&url=https%3A%2F%2Fedaa-org.github.io%2FpyEDAA.ProjectModel%2Findex.html)](https://edaa-org.github.io/pyEDAA.ProjectModel/) -[![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/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)](https://pypi.org/project/pyEDAA.ProjectModel/) ![PyPI - Status](https://img.shields.io/pypi/status/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pyEDAA.ProjectModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072) @@ -125,7 +125,7 @@ This layer is used by: # 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 bc36a5eb..c425c580 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -113,15 +113,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 770c058a..7dd9a92c 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:ProjectModel-github| image:: https://img.shields.io/badge/pyEDAA-ProjectModel-ab47bc.svg?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a +.. |SHIELD:svg:ProjectModel-github| image:: https://img.shields.io/badge/pyEDAA-ProjectModel-ab47bc?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a :alt: Sourcecode on GitHub :height: 22 :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel -.. |SHIELD:png:ProjectModel-github| image:: https://raster.shields.io/badge/pyEDAA-ProjectModel-ab47bc.svg?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a +.. |SHIELD:png:ProjectModel-github| image:: https://raster.shields.io/badge/pyEDAA-ProjectModel-ab47bc?longCache=true&style=flat-square&logo=github&longCache=true&logo=GitHub&labelColor=6a1b9a :alt: Sourcecode on GitHub :height: 22 :target: https://GitHub.com/edaa-org/pyEDAA.ProjectModel @@ -170,11 +170,11 @@ :target: https://edaa-org.github.io/pyEDAA.ProjectModel/ .. # Gitter -.. |SHIELD:svg:ProjectModel-gitter| image:: https://img.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef +.. |SHIELD:svg:ProjectModel-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:ProjectModel-gitter| image:: https://raster.shields.io/badge/chat-on%20gitter-4db797.svg?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef +.. |SHIELD:png:ProjectModel-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 From d7f5f00e26e154dbf171277daa7e758f0072943e Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Mon, 22 Jun 2026 08:06:37 +0200 Subject: [PATCH 3/3] Bumped dependencies. --- doc/Dependency.rst | 2 +- doc/requirements.txt | 2 +- pyEDAA/ProjectModel/__init__.py | 2 +- run.ps1 | 2 +- tests/typing/requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/Dependency.rst b/doc/Dependency.rst index 6d024bf3..7d8176fa 100644 --- a/doc/Dependency.rst +++ b/doc/Dependency.rst @@ -108,7 +108,7 @@ the mandatory dependencies too. +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ | `typing-extensions `__ | ≥4.15 | `PSF-2.0 `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `lxml `__ | ≥6.0 | `BSD 3-Clause `__ | *Not yet evaluated.* | +| `lxml `__ | ≥6.1 | `BSD 3-Clause `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ diff --git a/doc/requirements.txt b/doc/requirements.txt index 97d0da84..1fe1a6d1 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,7 @@ # Enforce latest version on ReadTheDocs sphinx ~= 9.1 -docutils ~= 0.22.0 +#docutils ~= 0.22.0 docutils_stubs ~= 0.0.22 # ReadTheDocs Theme diff --git a/pyEDAA/ProjectModel/__init__.py b/pyEDAA/ProjectModel/__init__.py index 93868b7c..fca266c9 100644 --- a/pyEDAA/ProjectModel/__init__.py +++ b/pyEDAA/ProjectModel/__init__.py @@ -34,7 +34,7 @@ __email__ = "Paebbels@gmail.com" __copyright__ = "2014-2026, Patrick Lehmann, Unai Martinez-Corral" __license__ = "Apache License, Version 2.0" -__version__ = "0.6.2" +__version__ = "0.6.3" __keywords__ = ["eda project", "model", "abstract", "xilinx", "vivado", "osvvm", "file set", "file group", "test bench", "test harness"] from os.path import relpath as path_relpath diff --git a/run.ps1 b/run.ps1 index 30f935f2..3b4702a4 100644 --- a/run.ps1 +++ b/run.ps1 @@ -33,7 +33,7 @@ Param( ) $PackageName = "pyEDAA.ProjectModel" -$PackageVersion = "0.6.2" +$PackageVersion = "0.6.3" # set default values $EnableDebug = [bool]$PSCmdlet.MyInvocation.BoundParameters["Debug"] diff --git a/tests/typing/requirements.txt b/tests/typing/requirements.txt index f1c46bb8..d8f2197c 100644 --- a/tests/typing/requirements.txt +++ b/tests/typing/requirements.txt @@ -3,4 +3,4 @@ # Static Type Checking mypy[reports] ~= 2.1 typing_extensions ~= 4.15 -lxml >= 5.4, <7.0 +lxml >= 6.1 , <7.0