Skip to content

Commit

Permalink
Bumped dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Paebbels
Paebbels committed Jul 16, 2024
1 parent 2f3a98b commit e5da811
Show file tree
Hide file tree
Showing 10 changed files with 126 additions and 126 deletions.
14 changes: 8 additions & 6 deletions doc/Dependency.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pyVHDLModel Package
+--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
| **Package** | **Version** | **License** | **Dependencies** |
+========================================================+=============+==========================================================================================+=================================================================================================================================+
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥6.3 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/master/LICENSE.txt>`__ | *None* |
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥6.5 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/master/LICENSE.txt>`__ | *None* |
+--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+


Expand Down Expand Up @@ -55,13 +55,13 @@ the mandatory dependencies too.
+---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
| `pytest-cov <https://GitHub.com/pytest-dev/pytest-cov>`__ | ≥5.0 | `MIT <https://GitHub.com/pytest-dev/pytest-cov/blob/master/LICENSE>`__ | *Not yet evaluated.* |
+---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
| `Coverage <https://GitHub.com/nedbat/coveragepy>`__ | ≥7.5 | `Apache License, 2.0 <https://GitHub.com/nedbat/coveragepy/blob/master/LICENSE.txt>`__ | *Not yet evaluated.* |
| `Coverage <https://GitHub.com/nedbat/coveragepy>`__ | ≥7.6 | `Apache License, 2.0 <https://GitHub.com/nedbat/coveragepy/blob/master/LICENSE.txt>`__ | *Not yet evaluated.* |
+---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
| `mypy <https://GitHub.com/python/mypy>`__ | ≥1.10 | `MIT <https://GitHub.com/python/mypy/blob/master/LICENSE>`__ | *Not yet evaluated.* |
+---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
| `typing-extensions <https://GitHub.com/python/typing_extensions>`__ | ≥4.11 | `PSF-2.0 <https://github.com/python/typing_extensions/blob/main/LICENSE>`__ | *Not yet evaluated.* |
+---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+
| `lxml <https://GitHub.com/lxml/lxml>`__ | ≥5.1 | `BSD 3-Clause <https://GitHub.com/lxml/lxml/blob/master/LICENSE.txt>`__ | *Not yet evaluated.* |
| `lxml <https://GitHub.com/lxml/lxml>`__ | ≥5.2 | `BSD 3-Clause <https://GitHub.com/lxml/lxml/blob/master/LICENSE.txt>`__ | *Not yet evaluated.* |
+---------------------------------------------------------------------+-------------+----------------------------------------------------------------------------------------+----------------------+


Expand Down Expand Up @@ -89,7 +89,9 @@ the mandatory dependencies too.
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
| **Package** | **Version** | **License** | **Dependencies** |
+=================================================================================================+==============+==========================================================================================================+======================+
| `Sphinx <https://GitHub.com/sphinx-doc/sphinx>`__ | ≥7.3 | `BSD 3-Clause <https://GitHub.com/sphinx-doc/sphinx/blob/master/LICENSE>`__ | *Not yet evaluated.* |
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥6.5 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.md>`__ | *None* |
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
| `Sphinx <https://GitHub.com/sphinx-doc/sphinx>`__ | ≥7.4 | `BSD 3-Clause <https://GitHub.com/sphinx-doc/sphinx/blob/master/LICENSE>`__ | *Not yet evaluated.* |
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
| `sphinxcontrib-mermaid <https://GitHub.com/mgaitan/sphinxcontrib-mermaid>`__ | ≥0.9.2 | `BSD <https://GitHub.com/mgaitan/sphinxcontrib-mermaid/blob/master/LICENSE.rst>`__ | *Not yet evaluated.* |
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
Expand All @@ -99,7 +101,7 @@ the mandatory dependencies too.
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
| !! `sphinx_fontawesome <https://GitHub.com/fraoustin/sphinx_fontawesome>`__ | ≥0.0.6 | `GPL 2.0 <https://GitHub.com/fraoustin/sphinx_fontawesome/blob/master/LICENSE>`__ | *Not yet evaluated.* |
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+
| `sphinx_autodoc_typehints <https://GitHub.com/agronholm/sphinx-autodoc-typehints>`__ | ≥2.1 | `MIT <https://GitHub.com/agronholm/sphinx-autodoc-typehints/blob/master/LICENSE>`__ | *Not yet evaluated.* |
| `sphinx_autodoc_typehints <https://GitHub.com/agronholm/sphinx-autodoc-typehints>`__ | ≥2.2 | `MIT <https://GitHub.com/agronholm/sphinx-autodoc-typehints/blob/master/LICENSE>`__ | *Not yet evaluated.* |
+-------------------------------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+----------------------+


Expand Down Expand Up @@ -127,7 +129,7 @@ install the mandatory dependencies too.
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
| **Package** | **Version** | **License** | **Dependencies** |
+============================================================================+==============+==========================================================================================================+======================================================================================================================================================+
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥6.3 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.md>`__ | *None* |
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥6.5 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.md>`__ | *None* |
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
| `wheel <https://GitHub.com/pypa/wheel>`__ | ≥0.43 | `MIT <https://github.com/pypa/wheel/blob/main/LICENSE.txt>`__ | *Not yet evaluated.* |
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
Expand Down
8 changes: 4 additions & 4 deletions doc/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
-r ../requirements.txt

pyTooling ~= 6.3
pyTooling ~= 6.4

# Enforce latest version on ReadTheDocs
sphinx ~= 7.3
docutils ~= 0.18.1
sphinx ~= 7.4
docutils ~= 0.20

# ReadTheDocs Theme
sphinx_rtd_theme ~= 2.0.0
Expand All @@ -18,7 +18,7 @@ sphinxcontrib-mermaid >= 0.9.2
autoapi >= 2.0.1
sphinx_design >= 0.5.0
sphinx-copybutton >= 0.5.2
sphinx_autodoc_typehints ~= 2.1
sphinx_autodoc_typehints ~= 2.2
sphinx_reports ~= 0.6
# changelog>=0.3.5

Expand Down
132 changes: 66 additions & 66 deletions pyVHDLModel/Concurrent.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ class ComponentInstantiation(Instantiation):
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
inst : component Counter;
inst : component Counter;
"""

_component: ComponentInstantiationSymbol
Expand All @@ -191,9 +191,9 @@ class EntityInstantiation(Instantiation):
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
inst : entity work. Counter;
inst : entity work. Counter;
"""

_entity: EntityInstantiationSymbol
Expand Down Expand Up @@ -225,9 +225,9 @@ class ConfigurationInstantiation(Instantiation):
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
inst : configuration Counter;
inst : configuration Counter;
"""

_configuration: ConfigurationInstantiationSymbol
Expand All @@ -250,13 +250,13 @@ class ProcessStatement(ConcurrentStatement, SequentialDeclarationsMixin, Sequent
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
proc: process(Clock)
-- sequential declarations
begin
-- sequential statements
end process;
proc: process(Clock)
-- sequential declarations
begin
-- sequential statements
end process;
"""

_sensitivityList: List[Name] # TODO: implement a SignalSymbol
Expand Down Expand Up @@ -368,17 +368,17 @@ class IfGenerateBranch(GenerateBranch, IfBranchMixin):
.. admonition:: Example
.. code-block:: VHDL
gen: if condition generate
-- concurrent declarations
begin
-- concurrent statements
elsif condition generate
-- ...
else generate
-- ...
end generate;
.. code-block:: VHDL
gen: if condition generate
-- concurrent declarations
begin
-- concurrent statements
elsif condition generate
-- ...
else generate
-- ...
end generate;
"""

def __init__(self, condition: ExpressionUnion, declaredItems: Nullable[Iterable] = None, statements: Nullable[Iterable[ConcurrentStatement]] = None, alternativeLabel: Nullable[str] = None):
Expand All @@ -393,17 +393,17 @@ class ElsifGenerateBranch(GenerateBranch, ElsifBranchMixin):
.. admonition:: Example
.. code-block:: VHDL
gen: if condition generate
-- ...
elsif condition generate
-- concurrent declarations
begin
-- concurrent statements
else generate
-- ...
end generate;
.. code-block:: VHDL
gen: if condition generate
-- ...
elsif condition generate
-- concurrent declarations
begin
-- concurrent statements
else generate
-- ...
end generate;
"""

def __init__(self, condition: ExpressionUnion, declaredItems: Nullable[Iterable] = None, statements: Nullable[Iterable[ConcurrentStatement]] = None, alternativeLabel: Nullable[str] = None):
Expand All @@ -418,17 +418,17 @@ class ElseGenerateBranch(GenerateBranch, ElseBranchMixin):
.. admonition:: Example
.. code-block:: VHDL
gen: if condition generate
-- ...
elsif condition generate
-- ...
else generate
-- concurrent declarations
begin
-- concurrent statements
end generate;
.. code-block:: VHDL
gen: if condition generate
-- ...
elsif condition generate
-- ...
else generate
-- concurrent declarations
begin
-- concurrent statements
end generate;
"""

def __init__(self, declaredItems: Nullable[Iterable] = None, statements: Nullable[Iterable[ConcurrentStatement]] = None, alternativeLabel: Nullable[str] = None):
Expand Down Expand Up @@ -471,15 +471,15 @@ class IfGenerateStatement(GenerateStatement):
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
gen: if condition generate
-- ...
elsif condition generate
-- ...
else generate
-- ...
end generate;
gen: if condition generate
-- ...
elsif condition generate
-- ...
else generate
-- ...
end generate;
.. seealso::
Expand Down Expand Up @@ -624,16 +624,16 @@ class CaseGenerateStatement(GenerateStatement):
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
gen: case selector generate
case choice1 =>
-- ...
case choice2 =>
-- ...
case others =>
-- ...
end generate;
gen: case selector generate
case choice1 =>
-- ...
case choice2 =>
-- ...
case others =>
-- ...
end generate;
"""

_expression: ExpressionUnion
Expand Down Expand Up @@ -676,11 +676,11 @@ class ForGenerateStatement(GenerateStatement, ConcurrentDeclarationRegionMixin,
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
gen: for i in 0 to 3 generate
-- ...
end generate;
gen: for i in 0 to 3 generate
-- ...
end generate;
"""

_loopIndex: str
Expand Down
8 changes: 4 additions & 4 deletions pyVHDLModel/Declaration.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ class Attribute(ModelEntity, NamedEntityMixin, DocumentedEntityMixin):
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
attribute TotalBits : natural;
attribute TotalBits : natural;
"""

_subtype: Symbol
Expand All @@ -118,9 +118,9 @@ class AttributeSpecification(ModelEntity, DocumentedEntityMixin):
.. admonition:: Example
.. code-block:: VHDL
.. code-block:: VHDL
attribute TotalBits of BusType : subtype is 32;
attribute TotalBits of BusType : subtype is 32;
"""

_identifiers: List[Name]
Expand Down
Loading

0 comments on commit e5da811

Please sign in to comment.