From 482dd124c8d6c42ba86c95f78f43116ad6826e9a Mon Sep 17 00:00:00 2001 From: Dan Fritchman Date: Fri, 24 May 2024 09:28:48 -0700 Subject: [PATCH] Versions => 6.0.0rc0 --- LICENSE | 2 +- SampleSitePdks/LICENSE | 2 +- SampleSitePdks/pyproject.toml | 34 +++++++-------- hdl21/__init__.py | 2 +- hdl21/tests/test_hdl21.py | 2 +- pdks/Asap7/LICENSE | 2 +- pdks/Asap7/pyproject.toml | 30 +++++++------ pdks/Gf180/LICENSE | 2 +- pdks/Gf180/pyproject.toml | 4 +- .../{{cookiecutter.repo_name}}/pyproject.toml | 18 ++++---- pdks/Sky130/LICENSE | 2 +- pdks/Sky130/pyproject.toml | 4 +- pyproject.toml | 42 +++++++++---------- readme.md | 2 - 14 files changed, 70 insertions(+), 78 deletions(-) diff --git a/LICENSE b/LICENSE index 2a2ea6c4..2468b167 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/SampleSitePdks/LICENSE b/SampleSitePdks/LICENSE index 2a2ea6c4..2468b167 100644 --- a/SampleSitePdks/LICENSE +++ b/SampleSitePdks/LICENSE @@ -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 diff --git a/SampleSitePdks/pyproject.toml b/SampleSitePdks/pyproject.toml index 4020485e..5490ff05 100644 --- a/SampleSitePdks/pyproject.toml +++ b/SampleSitePdks/pyproject.toml @@ -1,24 +1,22 @@ [project] name = "sitepdks" -version = "5.0.0" -description="PDK Installations on THIS Machine" +description = "PDK Installations on THIS Machine" +version = "6.0.0rc0" # 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>=6.0.0rc0,<7", # VLSIR_VERSION + "sky130-hdl21>=6.0.0rc0,<7", # VLSIR_VERSION + "gf180-hdl21>=6.0.0rc0,<7", # VLSIR_VERSION + "asap7-hdl21>=6.0.0rc0,<7", # 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", @@ -28,12 +26,12 @@ classifiers = [ [project.optional-dependencies] dev = [ - "pytest==7.1", - "coverage", - "pytest-cov", - "pre-commit==2.20", - "black==22.6", - "flit", + "pytest==7.1", + "coverage", + "pytest-cov", + "pre-commit==2.20", + "black==22.6", + "flit", ] [project.urls] diff --git a/hdl21/__init__.py b/hdl21/__init__.py index 2a0bc802..e5ca56c1 100644 --- a/hdl21/__init__.py +++ b/hdl21/__init__.py @@ -2,7 +2,7 @@ # Hdl21 Hardware Description Library """ -__version__ = "5.0.0" # NOTE: VLSIR_VERSION +__version__ = "6.0.0rc0" # VLSIR_VERSION # Internal (python) module aliases, overridden by names such as the `module` decorator function. from . import module as _module_module diff --git a/hdl21/tests/test_hdl21.py b/hdl21/tests/test_hdl21.py index 1b82c133..5eecb582 100644 --- a/hdl21/tests/test_hdl21.py +++ b/hdl21/tests/test_hdl21.py @@ -10,7 +10,7 @@ def test_version(): - assert h.__version__ == "5.0.0" # NOTE: VLSIR_VERSION + assert h.__version__ == "6.0.0rc0" # VLSIR_VERSION def test_module1(): diff --git a/pdks/Asap7/LICENSE b/pdks/Asap7/LICENSE index 2a2ea6c4..2468b167 100644 --- a/pdks/Asap7/LICENSE +++ b/pdks/Asap7/LICENSE @@ -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 diff --git a/pdks/Asap7/pyproject.toml b/pdks/Asap7/pyproject.toml index 58efed82..4c185e57 100644 --- a/pdks/Asap7/pyproject.toml +++ b/pdks/Asap7/pyproject.toml @@ -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 = "6.0.0rc0" # VLSIR_VERSION dependencies = [ - "hdl21 >= 5.0.0,<6.0.0", + "hdl21>=6.0.0rc0,<7", # 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", @@ -26,12 +24,12 @@ classifiers = [ [project.optional-dependencies] dev = [ - "pytest==7.1", - "coverage", - "pytest-cov", - "pre-commit==2.20", - "black==22.6", - "flit", + "pytest==7.1", + "coverage", + "pytest-cov", + "pre-commit==2.20", + "black==22.6", + "flit", ] [project.urls] diff --git a/pdks/Gf180/LICENSE b/pdks/Gf180/LICENSE index 2a2ea6c4..2468b167 100644 --- a/pdks/Gf180/LICENSE +++ b/pdks/Gf180/LICENSE @@ -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 diff --git a/pdks/Gf180/pyproject.toml b/pdks/Gf180/pyproject.toml index 9c4acda8..620b9f9d 100644 --- a/pdks/Gf180/pyproject.toml +++ b/pdks/Gf180/pyproject.toml @@ -1,9 +1,9 @@ [project] name = "gf180-hdl21" -version = "5.0.0" description="Global Foundries 180nm MCU PDK Package for Hdl21" +version = "6.0.0rc0" # VLSIR_VERSION dependencies = [ - "hdl21 >= 5.0.0,<6.0.0", + "hdl21>=6.0.0rc0,<7", # VLSIR_VERSION ] requires-python = ">=3.7, <3.13" maintainers = [ diff --git a/pdks/PdkTemplate/{{cookiecutter.repo_name}}/pyproject.toml b/pdks/PdkTemplate/{{cookiecutter.repo_name}}/pyproject.toml index 9e8ebffd..53dd4d5b 100644 --- a/pdks/PdkTemplate/{{cookiecutter.repo_name}}/pyproject.toml +++ b/pdks/PdkTemplate/{{cookiecutter.repo_name}}/pyproject.toml @@ -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>=6.0.0rc0,<7", # 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", @@ -18,12 +18,12 @@ classifiers = [ [project.optional-dependencies] dev = [ - "pytest==7.1", - "coverage", - "pytest-cov", - "pre-commit==2.20", - "black==22.6", - "flit", + "pytest==7.1", + "coverage", + "pytest-cov", + "pre-commit==2.20", + "black==22.6", + "flit", ] [build-system] diff --git a/pdks/Sky130/LICENSE b/pdks/Sky130/LICENSE index 2a2ea6c4..2468b167 100644 --- a/pdks/Sky130/LICENSE +++ b/pdks/Sky130/LICENSE @@ -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 diff --git a/pdks/Sky130/pyproject.toml b/pdks/Sky130/pyproject.toml index 1f64d849..0d5c31b7 100644 --- a/pdks/Sky130/pyproject.toml +++ b/pdks/Sky130/pyproject.toml @@ -1,9 +1,9 @@ [project] name = "sky130-hdl21" -version = "5.0.0" description="SkyWater 130nm PDK Package for Hdl21" +version = "6.0.0rc0" # VLSIR_VERSION dependencies = [ - "hdl21 >= 5.0.0,<6.0.0", + "hdl21>=6.0.0rc0,<7", # VLSIR_VERSION ] requires-python = ">=3.7, <3.13" maintainers = [ diff --git a/pyproject.toml b/pyproject.toml index 9f2938c8..b048df90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,28 +1,26 @@ [project] name = "hdl21" -version = "5.0.0" -description="Hardware Description Library" +description = "Hardware Description Library" +version = "6.0.0rc0" # VLSIR_VERSION dependencies = [ - "vlsir >= 5.0.0,<6.0.0", - "vlsirtools >= 5.0.0,<6.0.0", - "pydantic>=1.9.0,<2.7", + "vlsir>=6.0.0rc0,<7", # VLSIR_VERSION + "vlsirtools>=6.0.0rc0,<7", # 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", @@ -32,12 +30,12 @@ classifiers = [ [project.optional-dependencies] dev = [ - "pytest==7.1", - "coverage", - "pytest-cov", - "pre-commit==2.20", - "black==22.6", - "flit", + "pytest==7.1", + "coverage", + "pytest-cov", + "pre-commit==2.20", + "black==22.6", + "flit", ] [project.urls] diff --git a/readme.md b/readme.md index 1685fbb2..991e087e 100644 --- a/readme.md +++ b/readme.md @@ -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 ...