Skip to content

Commit

Permalink
[PyCDE] Fix versioning
Browse files Browse the repository at this point in the history
Versioning now working again locally. Hopefully closes #6178.
  • Loading branch information
teqdruid committed Sep 22, 2023
1 parent 1b901c3 commit c1734d0
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 22 deletions.
38 changes: 24 additions & 14 deletions frontends/PyCDE/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
[build-system]
requires = [
"setuptools>=42",
"setuptools_scm>=6.2",
"wheel",
"cmake>=3.12",

# MLIR build depends.
"numpy",
"pybind11>=2.9",
"PyYAML",
"setuptools>=68",
"setuptools_scm>=8.0",
"wheel",
"cmake>=3.12",

# PyCDE depends
"cocotb>=1.6.2",
"cocotb-test>=0.2.2",
"jinja2"
# MLIR build depends.
"numpy",
"pybind11>=2.9",
"PyYAML",

# PyCDE depends
"cocotb>=1.6.2",
"cocotb-test>=0.2.2",
"jinja2",
]
build-backend = "setuptools.build_meta"

# Enable version inference from Git.
[tool.setuptools_scm]
root = "../.."
relative_to = "setup.py"
tag_regex = "^pycde-(\\d+\\.\\d+\\.\\d+)?$"
local_scheme = "no-local-version"
git_describe_command = "git describe --dirty --tags --long --match pycde*"
Expand All @@ -32,3 +31,14 @@ manylinux-x86_64-image = "ghcr.io/circt/images/pycde-build"
[tool.cibuildwheel.linux]
# Use our internal auditwheel script so as to not mess up the collateral.
repair-wheel-command = "frontends/PyCDE/auditwheel.sh {dest_dir} {wheel}"

[project]
name = "pycde"
dynamic = ["version"]
description = "Python CIRCT Design Entry"
authors = [{ name = "John Demme", email = "[email protected]" }]
dependencies = ['numpy', 'jinja2']
requires-python = ">=3.8"

[project.urls]
"Homepage" = "https://circt.llvm.org/docs/PyCDE/"
6 changes: 0 additions & 6 deletions frontends/PyCDE/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,11 @@ def build_extension(self, ext):


setup(name="pycde",
version="0.0.1",
author="John Demme",
author_email="[email protected]",
description="Python CIRCT Design Entry",
long_description="",
include_package_data=True,
ext_modules=[
CMakeExtension("pycde.circt._mlir_libs._mlir"),
CMakeExtension("pycde.circt._mlir_libs._circt"),
],
install_requires=["numpy", "jinja2"],
cmdclass={
"build": CustomBuild,
"built_ext": NoopBuildExtension,
Expand Down
4 changes: 2 additions & 2 deletions lib/Bindings/Python/dialects/_msft_ops_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

from typing import Dict, Type
from typing import Dict, List, Type

from . import hw, msft as _msft
from . import _hw_ops_ext as _hw_ext
Expand Down Expand Up @@ -152,7 +152,7 @@ def is_external(self):
return len(self.regions[0].blocks) == 0

@property
def parameters(self) -> list[hw.ParamDeclAttr]:
def parameters(self) -> List[hw.ParamDeclAttr]:
return [
hw.ParamDeclAttr(a) for a in ArrayAttr(self.attributes["parameters"])
]
Expand Down

0 comments on commit c1734d0

Please sign in to comment.