From fb3c9f38ee4969c3039a1691b9029ca82d544596 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Mon, 23 Aug 2021 08:55:08 +0200 Subject: [PATCH 1/6] Bump version to v0.12.0. --- doc/conf.py | 4 ++-- pyVHDLModel/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index cd7f5d1e7..6e13ad593 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -36,8 +36,8 @@ def _LatestTagName(): return check_output(["git", "describe", "--abbrev=0", "--tags"], universal_newlines=True).strip() # The full version, including alpha/beta/rc tags -version = "0.11" # The short X.Y version. -release = "0.11.5" # The full version, including alpha/beta/rc tags. +version = "0.12" # The short X.Y version. +release = "0.12.0" # The full version, including alpha/beta/rc tags. try: if _IsUnderGitControl: latestTagName = _LatestTagName()[1:] # remove prefix "v" diff --git a/pyVHDLModel/__init__.py b/pyVHDLModel/__init__.py index b4b3dc97f..e4fba2bc9 100644 --- a/pyVHDLModel/__init__.py +++ b/pyVHDLModel/__init__.py @@ -46,7 +46,7 @@ from pydecor import export -__version__ = "0.11.5" +__version__ = "0.12.0" SimpleOrAttribute = Union['SimpleName', 'AttributeName'] diff --git a/setup.py b/setup.py index 2fea56d17..8f90bd7ee 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ # Assemble all package information setuptools_setup( name=projectName, - version="0.11.5", + version="0.12.0", author="Patrick Lehmann", author_email="Paebbels@gmail.com", From 5749a53ee61ed04fa04a4c5b34bccaa6e9299a0f Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Mon, 23 Aug 2021 08:58:38 +0200 Subject: [PATCH 2/6] Updated requirements. --- doc/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index e3886e19f..da63251ac 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,6 @@ -r ../requirements.txt # Enforce latest version on ReadTheDocs -sphinx>=4.0.2 +sphinx>=4.1.2 # Sphinx Extenstions #sphinx.ext.coverage @@ -19,4 +19,4 @@ sphinx_autodoc_typehints>=1.12.0 #btd.sphinx.inheritance_diagram>=2.3.1.post1 # Enforce newer version on ReadTheDocs (currently using 2.3.1) -Pygments>=2.9.0 +Pygments>=2.10.0 From 3f566028252c9ec6547286dbb6f9522f1a67506b Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Mon, 23 Aug 2021 23:56:02 +0200 Subject: [PATCH 3/6] Fixed typo for Choices. --- pyVHDLModel/SyntaxModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyVHDLModel/SyntaxModel.py b/pyVHDLModel/SyntaxModel.py index 19adee41b..564ae1139 100644 --- a/pyVHDLModel/SyntaxModel.py +++ b/pyVHDLModel/SyntaxModel.py @@ -2629,7 +2629,7 @@ def __init__(self, statements: Iterable[SequentialStatement] = None): SequentialStatements.__init__(self, statements) @property - def Choises(self) -> List[Choice]: + def Choices(self) -> List[Choice]: return self._choices @@ -2989,7 +2989,7 @@ def __init__(self, choices: Iterable[SequentialChoice], statements: Iterable[Seq self._choices = [c for c in choices] @property - def Choises(self) -> List[SequentialChoice]: + def Choices(self) -> List[SequentialChoice]: return self._choices def __str__(self) -> str: From a1c8a40e00429b6a22517241e8d3a0495d694529 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 24 Aug 2021 07:30:52 +0200 Subject: [PATCH 4/6] Added NullStatement. --- pyVHDLModel/SyntaxModel.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyVHDLModel/SyntaxModel.py b/pyVHDLModel/SyntaxModel.py index 564ae1139..b171757ee 100644 --- a/pyVHDLModel/SyntaxModel.py +++ b/pyVHDLModel/SyntaxModel.py @@ -3125,6 +3125,11 @@ class ExitStatement(LoopControlStatement): pass +@export +class NullStatement(SequentialStatement): + pass + + @export class WaitStatement(SequentialStatement, MixinConditional): _sensitivityList: Nullable[List[Name]] From ed341ae38a649d6d317f3409a4076576c0db2967 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 24 Aug 2021 07:37:07 +0200 Subject: [PATCH 5/6] Fixed example in README. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f9c081561..4a3c3a2ee 100644 --- a/README.md +++ b/README.md @@ -66,12 +66,12 @@ for entity in document.Entities: print(" generics:") for generic in entity.GenericItems: print(" - {} : {!s} {}".format( - generic.Identifier, generic.Mode, generic.Subtype) + ", ".join([str(i) for i in generic.Identifiers]), generic.Mode, generic.Subtype) ) print(" ports:") for port in entity.PortItems: print(" - {} : {!s} {}".format( - port.Identifier, port.Mode, port.Subtype) + ", ".join([str(i) for i in port.Identifiers]), port.Mode, port.Subtype) ) ``` From 991fe5a7f39cf5648de93d8096f8b6b9fd9decb1 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 24 Aug 2021 07:43:22 +0200 Subject: [PATCH 6/6] Fixed typo for Choices (another place). --- pyVHDLModel/SyntaxModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyVHDLModel/SyntaxModel.py b/pyVHDLModel/SyntaxModel.py index b171757ee..8cfddb3c7 100644 --- a/pyVHDLModel/SyntaxModel.py +++ b/pyVHDLModel/SyntaxModel.py @@ -2643,7 +2643,7 @@ def __init__(self, choices: Iterable[ConcurrentChoice], declaredItems: Iterable self._choices = [c for c in choices] @property - def Choises(self) -> List[ConcurrentChoice]: + def Choices(self) -> List[ConcurrentChoice]: return self._choices def __str__(self) -> str: