Skip to content

Commit

Permalink
Merge pull request #223 from dan-fritchman/v6track
Browse files Browse the repository at this point in the history
v6 Release Track
  • Loading branch information
dan-fritchman authored May 24, 2024
2 parents bdfbba8 + 0254abd commit cf3fc7b
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 102 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2021, Dan Fritchman
Copyright (c) 2021-24, Dan Fritchman
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion SampleSitePdks/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2021, Dan Fritchman
Copyright (c) 2021-24, Dan Fritchman
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
31 changes: 11 additions & 20 deletions SampleSitePdks/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
[project]
name = "sitepdks"
version = "5.0.0"
description="PDK Installations on THIS Machine"
description = "PDK Installations on THIS Machine"
version = "7.0.0.dev1" # VLSIR_VERSION
dependencies = [
"hdl21 >= 5.0.0,<6.0.0",
"sky130-hdl21 >= 5.0.0,<6.0.0",
"gf180-hdl21 >= 5.0.0,<6.0.0",
"asap7-hdl21 >= 5.0.0,<6.0.0",
"hdl21>=7.0.0.dev1", # VLSIR_VERSION
"sky130-hdl21>=7.0.0.dev1", # VLSIR_VERSION
"gf180-hdl21>=7.0.0.dev1", # VLSIR_VERSION
"asap7-hdl21>=7.0.0.dev1", # VLSIR_VERSION
]
requires-python = ">=3.7, <3.13"
maintainers = [
{name = "Dan Fritchman", email = "dan@fritch.mn"},
]
maintainers = [{ name = "Dan Fritchman", email = "dan@fritch.mn" }]
authors = [
{name = "Dan Fritchman", email = "dan@fritch.mn"},
{name = "Curtis Mayberry", email = "Curtisma3@gmail.com"},
{ name = "Dan Fritchman", email = "dan@fritch.mn" },
{ name = "Curtis Mayberry", email = "Curtisma3@gmail.com" },
]

readme = "readme.md"
license = {file = "LICENSE"}
license = { file = "LICENSE" }
keywords = ["HDL", "EDA", "analog", "circuit"]
classifiers = [
"Development Status :: 4 - Beta",
Expand All @@ -27,14 +25,7 @@ classifiers = [
]

[project.optional-dependencies]
dev = [
"pytest==7.1",
"coverage",
"pytest-cov",
"pre-commit==2.20",
"black==22.6",
"flit",
]
dev = ["vlsirdev"]

[project.urls]
Homepage = "https://github.com/dan-fritchman/Hdl21"
Expand Down
2 changes: 1 addition & 1 deletion hdl21/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Hdl21 Hardware Description Library
"""

__version__ = "5.0.0" # NOTE: VLSIR_VERSION
__version__ = "7.0.0.dev1" # VLSIR_VERSION

# Internal (python) module aliases, overridden by names such as the `module` decorator function.
from . import module as _module_module
Expand Down
2 changes: 1 addition & 1 deletion hdl21/tests/test_hdl21.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


def test_version():
assert h.__version__ == "5.0.0" # NOTE: VLSIR_VERSION
assert h.__version__ == "7.0.0.dev1" # VLSIR_VERSION


def test_module1():
Expand Down
2 changes: 1 addition & 1 deletion pdks/Asap7/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2021, Dan Fritchman
Copyright (c) 2021-24, Dan Fritchman
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
27 changes: 9 additions & 18 deletions pdks/Asap7/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
[project]
name = "asap7-hdl21"
version = "5.0.0"
description="ASAP7 PDK Package for Hdl21"
description = "ASAP7 PDK Package for Hdl21"
version = "7.0.0.dev1" # VLSIR_VERSION
dependencies = [
"hdl21 >= 5.0.0,<6.0.0",
"hdl21>=7.0.0.dev1", # VLSIR_VERSION
]
requires-python = ">=3.7, <3.13"
maintainers = [
{name = "Dan Fritchman", email = "dan@fritch.mn"},
]
maintainers = [{ name = "Dan Fritchman", email = "dan@fritch.mn" }]
authors = [
{name = "Dan Fritchman", email = "dan@fritch.mn"},
{name = "Thomas Pluck"},
{name = "Curtis Mayberry", email = "Curtisma3@gmail.com"},
{ name = "Dan Fritchman", email = "dan@fritch.mn" },
{ name = "Thomas Pluck" },
{ name = "Curtis Mayberry", email = "Curtisma3@gmail.com" },
]

readme = "readme.md"
license = {file = "LICENSE"}
license = { file = "LICENSE" }
keywords = ["PDK", "EDA", "analog", "circuit"]
classifiers = [
"Development Status :: 4 - Beta",
Expand All @@ -25,14 +23,7 @@ classifiers = [
]

[project.optional-dependencies]
dev = [
"pytest==7.1",
"coverage",
"pytest-cov",
"pre-commit==2.20",
"black==22.6",
"flit",
]
dev = ["vlsirdev"]

[project.urls]
Homepage = "https://github.com/dan-fritchman/Hdl21"
Expand Down
2 changes: 2 additions & 0 deletions pdks/Asap7/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

# ASAP7 Hdl21 PDK
2 changes: 1 addition & 1 deletion pdks/Gf180/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2021, Dan Fritchman
Copyright (c) 2021-24, Dan Fritchman
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
13 changes: 3 additions & 10 deletions pdks/Gf180/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[project]
name = "gf180-hdl21"
version = "5.0.0"
description="Global Foundries 180nm MCU PDK Package for Hdl21"
version = "7.0.0.dev1" # VLSIR_VERSION
dependencies = [
"hdl21 >= 5.0.0,<6.0.0",
"hdl21>=7.0.0.dev1", # VLSIR_VERSION
]
requires-python = ">=3.7, <3.13"
maintainers = [
Expand All @@ -25,14 +25,7 @@ classifiers = [
]

[project.optional-dependencies]
dev = [
"pytest==7.1",
"coverage",
"pytest-cov",
"pre-commit==2.20",
"black==22.6",
"flit",
]
dev = ["vlsirdev"]

[project.urls]
Homepage = "https://github.com/dan-fritchman/Hdl21"
Expand Down
15 changes: 4 additions & 11 deletions pdks/PdkTemplate/{{cookiecutter.repo_name}}/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[project]
name = "{{ cookiecutter.pypi_name }}"
description = "{{ cookiecutter.pdk_name }} PDK Package for Hdl21"
version = "{{cookiecutter.version}}"
description="{{ cookiecutter.pdk_name }} PDK Package for Hdl21"
dependencies = [
"hdl21 >= 5.0.0,<6.0.0",
"hdl21>=7.0.0.dev1", # VLSIR_VERSION
]
requires-python = ">=3.7, <3.13"

readme = "readme.md"
license = {file = "LICENSE"}
license = { file = "LICENSE" }
keywords = ["PDK", "EDA", "analog", "circuit"]
classifiers = [
"Development Status :: 4 - Beta",
Expand All @@ -17,14 +17,7 @@ classifiers = [
]

[project.optional-dependencies]
dev = [
"pytest==7.1",
"coverage",
"pytest-cov",
"pre-commit==2.20",
"black==22.6",
"flit",
]
dev = ["vlsirdev"]

[build-system]
requires = ["flit_core >=3.2,<4"]
Expand Down
2 changes: 1 addition & 1 deletion pdks/Sky130/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2021, Dan Fritchman
Copyright (c) 2021-24, Dan Fritchman
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
13 changes: 3 additions & 10 deletions pdks/Sky130/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[project]
name = "sky130-hdl21"
version = "5.0.0"
description="SkyWater 130nm PDK Package for Hdl21"
version = "7.0.0.dev1" # VLSIR_VERSION
dependencies = [
"hdl21 >= 5.0.0,<6.0.0",
"hdl21>=7.0.0.dev1", # VLSIR_VERSION
]
requires-python = ">=3.7, <3.13"
maintainers = [
Expand All @@ -25,14 +25,7 @@ classifiers = [
]

[project.optional-dependencies]
dev = [
"pytest==7.1",
"coverage",
"pytest-cov",
"pre-commit==2.20",
"black==22.6",
"flit",
]
dev = ["vlsirdev"]

[project.urls]
Homepage = "https://github.com/dan-fritchman/Hdl21"
Expand Down
39 changes: 15 additions & 24 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
[project]
name = "hdl21"
version = "5.0.0"
description="Hardware Description Library"
description = "Hardware Description Library"
version = "7.0.0.dev1" # VLSIR_VERSION
dependencies = [
"vlsir >= 5.0.0,<6.0.0",
"vlsirtools >= 5.0.0,<6.0.0",
"pydantic>=1.9.0,<2.7",
"vlsir>=7.0.0.dev1", # VLSIR_VERSION
"vlsirtools>=7.0.0.dev1", # VLSIR_VERSION
"pydantic>=1.9.0,<2.7",
]
requires-python = ">=3.7, <3.13"
maintainers = [
{name = "Dan Fritchman", email = "dan@fritch.mn"},
]
maintainers = [{ name = "Dan Fritchman", email = "dan@fritch.mn" }]
authors = [
{name = "Dan Fritchman", email = "dan@fritch.mn"},
{name = "Thomas Pluck"},
{name = "Kennedy Caisley"},
{name = "Zeyi Wang"},
{name = "Arya Reais-Parsi"},
{name = "Vighnesh Iyer"},
{name = "Curtis Mayberry", email = "Curtisma3@gmail.com"},
{ name = "Dan Fritchman", email = "dan@fritch.mn" },
{ name = "Thomas Pluck" },
{ name = "Kennedy Caisley" },
{ name = "Zeyi Wang" },
{ name = "Arya Reais-Parsi" },
{ name = "Vighnesh Iyer" },
{ name = "Curtis Mayberry", email = "Curtisma3@gmail.com" },
]

readme = "readme.md"
license = {file = "LICENSE"}
license = { file = "LICENSE" }
keywords = ["HDL", "EDA", "analog", "circuit"]
classifiers = [
"Development Status :: 4 - Beta",
Expand All @@ -31,14 +29,7 @@ classifiers = [
]

[project.optional-dependencies]
dev = [
"pytest==7.1",
"coverage",
"pytest-cov",
"pre-commit==2.20",
"black==22.6",
"flit",
]
dev = ["vlsirdev"]

[project.urls]
Homepage = "https://github.com/dan-fritchman/Hdl21"
Expand Down
2 changes: 0 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -1272,8 +1272,6 @@ There are lots of other very cool hardware-description projects out there which
```
$ pytest -s
============================ test session starts =============================
platform darwin -- Python 3.10.0, pytest-7.1.2, pluggy-1.0.0
plugins: anyio-3.5.0, cov-3.0.0
collected 126 items
hdl21/pdk/test_pdk.py ...
Expand Down

0 comments on commit cf3fc7b

Please sign in to comment.