Merge pull request Vlsir#91 from Vlsir/v6track

V6 Release Track

SpiceCmp/setup.py

@@ -15,11 +15,11 @@
 readme = here / "readme.md"
 long_description = "" if not readme.exists() else readme.read_text(encoding="utf-8")
 
-_VLSIR_VERSION = "5.0.0"
+VLSIR_VERSION = "7.0.0.dev1"
 
 setup(
     name="spicecmp",
-    version=_VLSIR_VERSION,
+    version=VLSIR_VERSION,
     description="Spice Models and Results Comparisons",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -30,11 +30,9 @@
     python_requires=">=3.7, <3.12",
     install_requires=[
         "pandas~=1.3",
-        f"hdl21=={_VLSIR_VERSION}",
-        f"vlsir=={_VLSIR_VERSION}",
-        f"vlsirtools=={_VLSIR_VERSION}",
+        f"hdl21=={VLSIR_VERSION}",
+        f"vlsir=={VLSIR_VERSION}",
+        f"vlsirtools=={VLSIR_VERSION}",
     ],
-    extras_require={
-        "dev": ["pytest==7.1", "coverage", "pytest-cov", "black==22.6", "twine"]
-    },
+    extras_require={"dev": ["vlsirdev"]},
 )

SpiceCmp/spicecmp/__init__.py

@@ -1,4 +1,8 @@
-__version__ = "2.0.dev0"
+"""
+# SpiceCmp 
+"""
+
+__version__ = "7.0.0.dev1"  # VLSIR_VERSION
 
 # Local Imports
 from .errormode import ErrorMode

SpiceCmp/tests/test_spicecmp.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == "2.0.dev0"
+    assert __version__ == "7.0.0.dev1"  # VLSIR_VERSION

VlsirDev/.gitignore

@@ -0,0 +1,154 @@
+scratch 
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

VlsirDev/LICENSE

@@ -0,0 +1 @@
+../LICENSE

VlsirDev/pyproject.toml

@@ -0,0 +1,34 @@
+[project]
+name = "vlsirdev"
+description = "VLSIR Development Dependencies"
+version = "7.0.0.dev1" # VLSIR_VERSION
+dependencies = [ # <= This right here is the whole point of this package!
+    "pytest==7.1",
+    "coverage",
+    "pytest-cov",
+    "pre-commit==2.20",
+    "black==22.6",
+    "flit",
+    # NOTE: some debate about whether `flit` replaces these two. Not in our publishing scripts, yet. 
+    "twine",
+    "build",
+]
+requires-python = ">=3.7, <3.13"
+maintainers = [{ name = "Dan Fritchman", email = "[email protected]" }]
+authors = [{ name = "Dan Fritchman", email = "[email protected]" }]
+
+readme = "readme.md"
+license = { file = "LICENSE" }
+keywords = ["PDK", "EDA", "analog", "circuit"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Programming Language :: Python",
+    "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
+]
+
+[build-system]
+requires = ["flit_core >=3.2,<4"]
+build-backend = "flit_core.buildapi"
+
+[tool.flit.module]
+name = "vlsirdev"

VlsirDev/readme.md

@@ -0,0 +1,6 @@
+
+# VLSIR Dev 
+
+Not a real package in the sense of doing anything. 
+Really just a container for development dependencies.
+Including sync'ing all their versions. 

VlsirDev/vlsirdev/__init__.py

@@ -0,0 +1,9 @@
+""" 
+# VLSIR Dev 
+
+Not a real package in the sense of doing anything. 
+Really just a container for development dependencies.
+Including sync'ing all their versions. 
+"""
+
+__version__ = "7.0.0.dev1"  # VLSIR_VERSION

VlsirTools/setup.py

@@ -15,11 +15,11 @@
 readme = here / "readme.md"
 long_description = "" if not readme.exists() else readme.read_text(encoding="utf-8")
 
-_VLSIR_VERSION = "5.0.0"
+VLSIR_VERSION = "7.0.0.dev1"
 
 setup(
     name="vlsirtools",
-    version=_VLSIR_VERSION,
+    version=VLSIR_VERSION,
     description="Tools for the Vlsir IC Design Schema",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -29,11 +29,9 @@
     packages=find_packages(),
     python_requires=">=3.7, <3.12",
     install_requires=[
-        f"vlsir=={_VLSIR_VERSION}",  # VLSIR Core Python Bindings
+        f"vlsir=={VLSIR_VERSION}",  # VLSIR Core Python Bindings
         "numpy~=1.21",  # For `sim_data` simulation results
         "pandas~=1.3",  # For CSV reading
     ],
-    extras_require={
-        "dev": ["pytest==7.1", "coverage", "pytest-cov", "black==22.6", "twine"]
-    },
+    extras_require={"dev": ["vlsirdev"]},
 )

VlsirTools/tests/test_vlsirtools.py

@@ -55,7 +55,7 @@ def _prim(name: str) -> Reference:
 
 
 def test_version():
-    assert vlsirtools.__version__ == "2.0.dev0"
+    assert vlsirtools.__version__ == "7.0.0.dev1"  # VLSIR_VERSION
 
 
 def test_verilog_netlist1():

VlsirTools/vlsirtools/__init__.py

@@ -2,7 +2,7 @@
 # Vlsir Tools
 """
 
-__version__ = "2.0.dev0"
+__version__ = "7.0.0.dev1"  # VLSIR_VERSION
 
 # Python module namespaces
 from . import spice

bindings/python/setup.py

@@ -15,11 +15,11 @@
 readme = here / "readme.md"
 long_description = "" if not readme.exists() else readme.read_text(encoding="utf-8")
 
-_VLSIR_VERSION = "5.0.0"
+VLSIR_VERSION = "7.0.0.dev1"
 
 setup(
     name="vlsir",
-    version=_VLSIR_VERSION,
+    version=VLSIR_VERSION,
     description="Python Bindings to the VLSIR Data Schemas for Chip Design",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -40,7 +40,5 @@
         # So, versions before this will generally fail pretty hard.
         "protobuf~=4.23"
     ],
-    extras_require={
-        "dev": ["pytest==7.1", "coverage", "pytest-cov", "black==22.6", "twine"]
-    },
+    extras_require={"dev": ["vlsirdev"]},
 )

bindings/python/vlsir/__init__.py

@@ -1,8 +1,11 @@
 """
-VLSIR Python Bindings 
+# VLSIR Python Bindings 
+
+Note while most modules in this package are protobuf-compiler generated, 
+*this* top-level namespace module is not! 
 """
 
-__version__ = "2.0.dev0"
+__version__ = "7.0.0.dev1" # VLSIR_VERSION
 
 # Schema
 from . import utils_pb2 as utils

bindings/rust/Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/Vlsir/Vlsir"
 # FIXME: Rust/ Cargo/ crates.io have a different pre/dev release format from some other package managers. 
 # Particularly there is no "dev" distinction, only "pre"-releases e.g. "3.0.0-pre.3". 
 # And the "pre" comes with a dash instead of a dot. 
-version = "5.0.0" 
+version = "7.0.0-pre.0"
 
 [dependencies]
 prost = "0.11.8"

bindings/ts/package.json

@@ -2,7 +2,7 @@
   "name": "vlsir",
   "description": "TypeScript bindings to the VLSIR IC design schemas",
   "license": "BSD-3-Clause",
-  "version": "VLSIR_VERSION",
+  "version": "7.0.0.dev1",
   "main": "src/index",
   "dependencies": {
     "ts-proto": "^1.172.0",