Skip to content

Commit 7590a6c

Browse files
PaebbelsPaebbels
authored
v0.24.1
2 parents c897177 + 93d3b59 commit 7590a6c

File tree

8 files changed

+41
-7
lines changed

8 files changed

+41
-7
lines changed

‎doc/Dependency.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pyVHDLModel Package
2323
+--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
2424
| **Package** | **Version** | **License** | **Dependencies** |
2525
+========================================================+=============+==========================================================================================+=================================================================================================================================+
26-
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥4.0.0 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/master/LICENSE.txt>`__ | *None* |
26+
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥4.0.1 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/master/LICENSE.txt>`__ | *None* |
2727
+--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
2828

2929

@@ -125,7 +125,7 @@ install the mandatory dependencies too.
125125
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
126126
| **Package** | **Version** | **License** | **Dependencies** |
127127
+============================================================================+==============+==========================================================================================================+======================================================================================================================================================+
128-
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥4.0.0 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.md>`__ | *None* |
128+
| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥4.0.1 | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.md>`__ | *None* |
129129
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
130130
| `wheel <https://GitHub.com/pypa/wheel>`__ | ≥0.38.1 | `MIT <https://github.com/pypa/wheel/blob/main/LICENSE.txt>`__ | *Not yet evaluated.* |
131131
+----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+

‎doc/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-r ../requirements.txt
22

3-
pyTooling>=4.0.0, <5.0
3+
pyTooling>=4.0.1, <5.0
44

55
# Enforce latest version on ReadTheDocs
66
sphinx>=5.3.0, <6.0

‎pyVHDLModel/IEEE.py‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ class Ieee(PredefinedLibrary):
4040
def __init__(self):
4141
super().__init__(PACKAGES)
4242

43+
def LoadSynopsysPackages(self):
44+
self.AddPackages(PACKAGES_SYNOPSYS)
45+
46+
4347

4448
@export
4549
class Math_Real(PredefinedPackage):
@@ -84,6 +88,18 @@ def __init__(self):
8488
self._AddPackageClause(("IEEE.std_logic_1164.all", ))
8589

8690

91+
class Std_logic_misc(PredefinedPackage):
92+
def __init__(self):
93+
super().__init__()
94+
95+
self._AddLibraryClause(("IEEE", ))
96+
self._AddPackageClause(("IEEE.std_logic_1164.all", ))
97+
98+
99+
class Std_logic_misc_Body(PredefinedPackageBody):
100+
pass
101+
102+
87103
class Numeric_Bit(PredefinedPackage):
88104
def __init__(self):
89105
super().__init__()
@@ -119,7 +135,6 @@ def __init__(self):
119135
class Numeric_Std_Body(PredefinedPackageBody):
120136
pass
121137

122-
123138
class Numeric_Std_Unsigned(PredefinedPackage):
124139
def __init__(self):
125140
super().__init__()
@@ -203,3 +218,7 @@ def __init__(self):
203218
(Float_Generic_Pkg, Float_Generic_Pkg_Body),
204219
(Float_Pkg, None),
205220
)
221+
222+
PACKAGES_SYNOPSYS = (
223+
(Std_logic_misc, Std_logic_misc_Body),
224+
)

‎pyVHDLModel/STD.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ class PredefinedLibrary(Library):
4444
def __init__(self, packages):
4545
super().__init__(self.__class__.__name__)
4646

47+
self.AddPackages(packages)
48+
49+
def AddPackages(self, packages):
4750
for packageType, packageBodyType in packages:
4851
package: Package = packageType()
4952
package.Library = self

‎pyVHDLModel/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
__email__ = "[email protected]"
4949
__copyright__ = "2016-2023, Patrick Lehmann"
5050
__license__ = "Apache License, Version 2.0"
51-
__version__ = "0.24.0"
51+
__version__ = "0.24.1"
5252

5353

5454
from enum import unique, Enum, Flag, auto

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
22
requires = [
3-
"pyTooling >= 4.0.0",
3+
"pyTooling >= 4.0.1",
44
"setuptools >= 62.3.3",
55
"wheel >= 0.38.1"
66
]

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pyTooling>=4.0.0, <5.0
1+
pyTooling>=4.0.1, <5.0

‎tests/unit/Instantiate.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,3 +432,15 @@ def test_IeeeLibrary(self):
432432
self.assertEqual(9, len(ieeeLibrary.PackageBodies))
433433

434434
self.assertSetEqual(set(design.IterateDesignUnits()), set(ieeeLibrary.IterateDesignUnits()))
435+
436+
def test_IeeeSynopsysLibrary(self):
437+
design = Design()
438+
ieeeLibrary = design.LoadIEEELibrary()
439+
ieeeLibrary.LoadSynopsysPackages()
440+
441+
self.assertEqual(1, len(design.Libraries))
442+
self.assertEqual("ieee", ieeeLibrary.NormalizedIdentifier)
443+
self.assertEqual(14, len(ieeeLibrary.Packages))
444+
self.assertEqual(10, len(ieeeLibrary.PackageBodies))
445+
446+
self.assertSetEqual(set(design.IterateDesignUnits()), set(ieeeLibrary.IterateDesignUnits()))

0 commit comments

Comments
 (0)