From 1b9b3fd0b2f6a5d4cf47e2a2db393760bab44047 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Mon, 9 Dec 2024 22:04:34 +0100 Subject: [PATCH 1/6] Bumped dependencies. --- .github/workflows/Pipeline.yml | 2 +- .gitignore | 12 +++++++++++- doc/Installation.rst | 6 ++++-- doc/requirements.txt | 7 ------- pyproject.toml | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml index 41fe514bc..6cdd3656c 100644 --- a/.github/workflows/Pipeline.yml +++ b/.github/workflows/Pipeline.yml @@ -9,7 +9,7 @@ on: jobs: Pipeline: - uses: pyTooling/Actions/.github/workflows/CompletePipeline.yml@r2 + uses: pyTooling/Actions/.github/workflows/CompletePipeline.yml@r3 with: package_name: pyVHDLModel secrets: diff --git a/.gitignore b/.gitignore index 0a6c77a3c..fe6879c10 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,13 @@ __pycache__/ .coverage .cov coverage.xml +/report/coverage + +# mypy +/report/typing + +# pytest +/report/unit # setuptools /build/**/*.* @@ -21,5 +28,8 @@ coverage.xml /doc/pyVHDLModel/**/*.* !/doc/pyVHDLModel/index.rst -# PyCharm project +# PyCharm project files /.idea/workspace.xml + +# Git files +!.git* diff --git a/doc/Installation.rst b/doc/Installation.rst index db6ed914b..e89fcb80d 100644 --- a/doc/Installation.rst +++ b/doc/Installation.rst @@ -38,8 +38,10 @@ details. # Basic sphinx-reports package pip install pyVHDLModel -Developers can install further dependencies for documentation generation (``doc``) or running unit tests (``test``) or -just all (``all``) dependencies. +Developers can install the |PackageName| package itself or the package with further dependencies for documentation +generation (``doc``), running unit tests (``test``) or just all (``all``) dependencies. + +See :ref:`DEP` for more details. .. tab-set:: diff --git a/doc/requirements.txt b/doc/requirements.txt index de1dd2bd4..bfb8bf1d5 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -9,16 +9,9 @@ docutils_stubs ~= 0.0.22 sphinx_rtd_theme ~= 3.0.0 # Sphinx Extenstions -#sphinxcontrib-actdiag>=0.8.5 sphinxcontrib-mermaid ~= 1.0 -#sphinxcontrib-seqdiag>=0.8.5 -#sphinxcontrib-textstyle>=0.2.1 -#sphinxcontrib-spelling>=2.2.0 autoapi >= 2.0.1 sphinx_design ~= 0.6.1 sphinx-copybutton >= 0.5.2 sphinx_autodoc_typehints ~= 2.5 sphinx_reports ~= 0.7 -# changelog>=0.3.5 - -# BuildTheDocs Extensions (mostly patched Sphinx extensions) diff --git a/pyproject.toml b/pyproject.toml index 1c8f7adef..f61d13772 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools ~= 75.3", + "setuptools ~= 75.5", "wheel ~= 0.45", "pyTooling ~= 8.0" ] From fe72d5b9faa7545e27c6310281c617bc4d7cadd5 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sun, 9 Feb 2025 19:26:43 +0100 Subject: [PATCH 2/6] Bumped dependencies. --- dist/requirements.txt | 2 +- doc/Dependency.rst | 12 ++++++------ doc/requirements.txt | 4 ++-- pyproject.toml | 4 ++-- requirements.txt | 2 +- tests/requirements.txt | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dist/requirements.txt b/dist/requirements.txt index 918a0be9d..778498a1c 100644 --- a/dist/requirements.txt +++ b/dist/requirements.txt @@ -1,2 +1,2 @@ wheel ~= 0.45 -twine ~= 5.1 +twine ~= 6.1 diff --git a/doc/Dependency.rst b/doc/Dependency.rst index 7f91258c6..9ee160d6c 100644 --- a/doc/Dependency.rst +++ b/doc/Dependency.rst @@ -23,7 +23,7 @@ pyVHDLModel Package +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +========================================================+=============+==========================================================================================+=================================================================================================================================+ -| `pyTooling `__ | ≥8.0 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.1 | `Apache License, 2.0 `__ | *None* | +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+ @@ -57,7 +57,7 @@ the mandatory dependencies too. +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ | `Coverage `__ | ≥7.6 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ -| `mypy `__ | ≥1.13 | `MIT `__ | *Not yet evaluated.* | +| `mypy `__ | ≥1.15 | `MIT `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ | `typing-extensions `__ | ≥4.12 | `PSF-2.0 `__ | *Not yet evaluated.* | +---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+ @@ -89,7 +89,7 @@ the mandatory dependencies too. +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+ | **Package** | **Version** | **License** | **Dependencies** | +=================================================================================================+==============+==========================================================================================================+======================+ -| `pyTooling `__ | ≥8.0 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.1 | `Apache License, 2.0 `__ | *None* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+ | `Sphinx `__ | ≥8.1 | `BSD 3-Clause `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+ @@ -101,7 +101,7 @@ the mandatory dependencies too. +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+ | !! `sphinx_fontawesome `__ | ≥0.0.6 | `GPL 2.0 `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+ -| `sphinx_autodoc_typehints `__ | ≥2.5 | `MIT `__ | *Not yet evaluated.* | +| `sphinx_autodoc_typehints `__ | ≥3.0 | `MIT `__ | *Not yet evaluated.* | +-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+ @@ -129,7 +129,7 @@ install the mandatory dependencies too. +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | **Package** | **Version** | **License** | **Dependencies** | +============================================================================+==============+==========================================================================================================+======================================================================================================================================================+ -| `pyTooling `__ | ≥8.0 | `Apache License, 2.0 `__ | *None* | +| `pyTooling `__ | ≥8.1 | `Apache License, 2.0 `__ | *None* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ | `wheel `__ | ≥0.45 | `MIT `__ | *Not yet evaluated.* | +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -162,5 +162,5 @@ install the mandatory dependencies too. +==========================================================+==============+===========================================================================================+======================+ | `wheel `__ | ≥0.45 | `MIT `__ | *Not yet evaluated.* | +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ -| `Twine `__ | ≥5.1 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +| `Twine `__ | ≥6.1 | `Apache License, 2.0 `__ | *Not yet evaluated.* | +----------------------------------------------------------+--------------+-------------------------------------------------------------------------------------------+----------------------+ diff --git a/doc/requirements.txt b/doc/requirements.txt index bfb8bf1d5..d1e693b52 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -6,12 +6,12 @@ docutils ~= 0.21 docutils_stubs ~= 0.0.22 # ReadTheDocs Theme -sphinx_rtd_theme ~= 3.0.0 +sphinx_rtd_theme ~= 3.0 # Sphinx Extenstions sphinxcontrib-mermaid ~= 1.0 autoapi >= 2.0.1 sphinx_design ~= 0.6.1 sphinx-copybutton >= 0.5.2 -sphinx_autodoc_typehints ~= 2.5 +sphinx_autodoc_typehints ~= 3.0 sphinx_reports ~= 0.7 diff --git a/pyproject.toml b/pyproject.toml index f61d13772..96eccd604 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] requires = [ - "setuptools ~= 75.5", + "setuptools ~= 75.8", "wheel ~= 0.45", - "pyTooling ~= 8.0" + "pyTooling ~= 8.1" ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index 4db354945..9ce072fbe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pyTooling ~= 8.0 +pyTooling ~= 8.1 diff --git a/tests/requirements.txt b/tests/requirements.txt index 2ad659b65..b20836add 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -8,6 +8,6 @@ pytest ~= 8.3 pytest-cov ~= 6.0 # Static Type Checking -mypy ~= 1.13 +mypy ~= 1.15 typing_extensions ~= 4.12 lxml ~= 5.3 From c153084a4868f5d8966b02d954cce5e942522c55 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sun, 9 Feb 2025 19:27:49 +0100 Subject: [PATCH 3/6] Bumped copyright year to 2025. --- pyVHDLModel/Association.py | 2 +- pyVHDLModel/Base.py | 2 +- pyVHDLModel/Common.py | 2 +- pyVHDLModel/Concurrent.py | 2 +- pyVHDLModel/Declaration.py | 2 +- pyVHDLModel/DesignUnit.py | 2 +- pyVHDLModel/Exception.py | 2 +- pyVHDLModel/Expression.py | 2 +- pyVHDLModel/IEEE.py | 2 +- pyVHDLModel/Instantiation.py | 2 +- pyVHDLModel/Interface.py | 2 +- pyVHDLModel/Name.py | 2 +- pyVHDLModel/Namespace.py | 2 +- pyVHDLModel/Object.py | 2 +- pyVHDLModel/PSLModel.py | 2 +- pyVHDLModel/Predefined.py | 2 +- pyVHDLModel/Regions.py | 2 +- pyVHDLModel/STD.py | 2 +- pyVHDLModel/Sequential.py | 2 +- pyVHDLModel/Subprogram.py | 2 +- pyVHDLModel/Symbol.py | 2 +- pyVHDLModel/Type.py | 2 +- pyVHDLModel/__init__.py | 6 +++--- setup.py | 2 +- tests/unit/Analyze.py | 2 +- tests/unit/Instantiate.py | 2 +- tests/unit/__init__.py | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pyVHDLModel/Association.py b/pyVHDLModel/Association.py index fc06eee46..8ea6ff1fd 100644 --- a/pyVHDLModel/Association.py +++ b/pyVHDLModel/Association.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Base.py b/pyVHDLModel/Base.py index b28ba35ec..011d4b5d8 100644 --- a/pyVHDLModel/Base.py +++ b/pyVHDLModel/Base.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Common.py b/pyVHDLModel/Common.py index c9ce2042a..b77527d86 100644 --- a/pyVHDLModel/Common.py +++ b/pyVHDLModel/Common.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Concurrent.py b/pyVHDLModel/Concurrent.py index 3b5abde65..3a4376aca 100644 --- a/pyVHDLModel/Concurrent.py +++ b/pyVHDLModel/Concurrent.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Declaration.py b/pyVHDLModel/Declaration.py index 52dd9d92f..fff00bbde 100644 --- a/pyVHDLModel/Declaration.py +++ b/pyVHDLModel/Declaration.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/DesignUnit.py b/pyVHDLModel/DesignUnit.py index c528f1068..50ed9f84e 100644 --- a/pyVHDLModel/DesignUnit.py +++ b/pyVHDLModel/DesignUnit.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Exception.py b/pyVHDLModel/Exception.py index a46cea51d..18f50a7c0 100644 --- a/pyVHDLModel/Exception.py +++ b/pyVHDLModel/Exception.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Expression.py b/pyVHDLModel/Expression.py index bec3d090e..adbb63dc6 100644 --- a/pyVHDLModel/Expression.py +++ b/pyVHDLModel/Expression.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/IEEE.py b/pyVHDLModel/IEEE.py index 67854b82a..0e743fa33 100644 --- a/pyVHDLModel/IEEE.py +++ b/pyVHDLModel/IEEE.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Instantiation.py b/pyVHDLModel/Instantiation.py index 93cdf0c9e..c8ab08cd3 100644 --- a/pyVHDLModel/Instantiation.py +++ b/pyVHDLModel/Instantiation.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Interface.py b/pyVHDLModel/Interface.py index 3f74056af..07e418924 100644 --- a/pyVHDLModel/Interface.py +++ b/pyVHDLModel/Interface.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Name.py b/pyVHDLModel/Name.py index 2f4e412c7..eaca3ac5d 100644 --- a/pyVHDLModel/Name.py +++ b/pyVHDLModel/Name.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Namespace.py b/pyVHDLModel/Namespace.py index e3248e41a..2ca926750 100644 --- a/pyVHDLModel/Namespace.py +++ b/pyVHDLModel/Namespace.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Object.py b/pyVHDLModel/Object.py index 5db266077..54cac0bc4 100644 --- a/pyVHDLModel/Object.py +++ b/pyVHDLModel/Object.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/PSLModel.py b/pyVHDLModel/PSLModel.py index bac82392a..3ce2a34a0 100644 --- a/pyVHDLModel/PSLModel.py +++ b/pyVHDLModel/PSLModel.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Predefined.py b/pyVHDLModel/Predefined.py index 023cc3e6b..b70982469 100644 --- a/pyVHDLModel/Predefined.py +++ b/pyVHDLModel/Predefined.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Regions.py b/pyVHDLModel/Regions.py index 22d50c2af..9754497cc 100644 --- a/pyVHDLModel/Regions.py +++ b/pyVHDLModel/Regions.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/STD.py b/pyVHDLModel/STD.py index 3e9085db8..40aceb937 100644 --- a/pyVHDLModel/STD.py +++ b/pyVHDLModel/STD.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Sequential.py b/pyVHDLModel/Sequential.py index 7df46d5f7..a4078008f 100644 --- a/pyVHDLModel/Sequential.py +++ b/pyVHDLModel/Sequential.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Subprogram.py b/pyVHDLModel/Subprogram.py index d9a8748ef..efea91d01 100644 --- a/pyVHDLModel/Subprogram.py +++ b/pyVHDLModel/Subprogram.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Symbol.py b/pyVHDLModel/Symbol.py index d839300c4..c8dba4fb1 100644 --- a/pyVHDLModel/Symbol.py +++ b/pyVHDLModel/Symbol.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/Type.py b/pyVHDLModel/Type.py index fde065b22..2243b3ab4 100644 --- a/pyVHDLModel/Type.py +++ b/pyVHDLModel/Type.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/pyVHDLModel/__init__.py b/pyVHDLModel/__init__.py index 8e6c9e588..210067a41 100644 --- a/pyVHDLModel/__init__.py +++ b/pyVHDLModel/__init__.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # @@ -40,13 +40,13 @@ .. admonition:: Copyright Information - :copyright: Copyright 2017-2024 Patrick Lehmann - Bötzingen, Germany + :copyright: Copyright 2017-2025 Patrick Lehmann - Bötzingen, Germany :copyright: Copyright 2016-2017 Patrick Lehmann - Dresden, Germany :license: Apache License, Version 2.0 """ __author__ = "Patrick Lehmann" __email__ = "Paebbels@gmail.com" -__copyright__ = "2016-2024, Patrick Lehmann" +__copyright__ = "2016-2025, Patrick Lehmann" __license__ = "Apache License, Version 2.0" __version__ = "0.29.2" diff --git a/setup.py b/setup.py index 848be1ea6..98d60ea68 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/tests/unit/Analyze.py b/tests/unit/Analyze.py index b44c2c505..c6fafd363 100644 --- a/tests/unit/Analyze.py +++ b/tests/unit/Analyze.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/tests/unit/Instantiate.py b/tests/unit/Instantiate.py index 1b0cc9286..5a31bd209 100644 --- a/tests/unit/Instantiate.py +++ b/tests/unit/Instantiate.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index 7205b09d8..1f2b70800 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -11,7 +11,7 @@ # # # License: # # ==================================================================================================================== # -# Copyright 2017-2024 Patrick Lehmann - Boetzingen, Germany # +# Copyright 2017-2025 Patrick Lehmann - Boetzingen, Germany # # Copyright 2016-2017 Patrick Lehmann - Dresden, Germany # # # # Licensed under the Apache License, Version 2.0 (the "License"); # From d312ff5274d8fd604ae7b28ff1f7a730ce53abbb Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sun, 9 Feb 2025 19:28:23 +0100 Subject: [PATCH 4/6] Fixed handling of 'library work;' --- pyVHDLModel/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyVHDLModel/__init__.py b/pyVHDLModel/__init__.py index 210067a41..6e18d5573 100644 --- a/pyVHDLModel/__init__.py +++ b/pyVHDLModel/__init__.py @@ -1365,6 +1365,9 @@ def LinkLibraryReferences(self) -> None: # A library clause can have multiple comma-separated references for librarySymbol in libraryReference.Symbols: libraryIdentifier = librarySymbol.Name.NormalizedIdentifier + if libraryIdentifier == "work": + continue + try: library = self._libraries[libraryIdentifier] except KeyError: From 6e61656c1c3f3da094e78ff1d80d239855c1f3f4 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sun, 9 Feb 2025 19:28:46 +0100 Subject: [PATCH 5/6] Added tool.pytest section to pyproject.toml. --- pyVHDLModel/__init__.py | 4 ++-- pyproject.toml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pyVHDLModel/__init__.py b/pyVHDLModel/__init__.py index 6e18d5573..13c875e47 100644 --- a/pyVHDLModel/__init__.py +++ b/pyVHDLModel/__init__.py @@ -48,7 +48,7 @@ __email__ = "Paebbels@gmail.com" __copyright__ = "2016-2025, Patrick Lehmann" __license__ = "Apache License, Version 2.0" -__version__ = "0.29.2" +__version__ = "0.29.4" from enum import unique, Enum, Flag, auto @@ -1367,7 +1367,7 @@ def LinkLibraryReferences(self) -> None: libraryIdentifier = librarySymbol.Name.NormalizedIdentifier if libraryIdentifier == "work": continue - + try: library = self._libraries[libraryIdentifier] except KeyError: diff --git a/pyproject.toml b/pyproject.toml index 96eccd604..191f828aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,9 @@ show_error_codes = true namespace_packages = true html_report = "report/typing" +[tool.pytest] +junit_xml = "report/unit/TestReportSummary.xml" + [tool.pytest.ini_options] addopts = "--tb=native" # Don't set 'python_classes = *' otherwise, pytest doesn't search for classes From d6bbb2b9c0b9eca2d91778c86d0a6551d016089f Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sun, 9 Feb 2025 19:35:48 +0100 Subject: [PATCH 6/6] Updated used pipeline template to `@r4`. --- .github/workflows/Pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml index 6cdd3656c..62a70ad86 100644 --- a/.github/workflows/Pipeline.yml +++ b/.github/workflows/Pipeline.yml @@ -9,7 +9,7 @@ on: jobs: Pipeline: - uses: pyTooling/Actions/.github/workflows/CompletePipeline.yml@r3 + uses: pyTooling/Actions/.github/workflows/CompletePipeline.yml@r4 with: package_name: pyVHDLModel secrets: