Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add GDS to JSON/ YAML/ TOML Conversion CLI #35

Merged
merged 12 commits into from
Dec 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ jobs:
- name: Install 2to3, protobuf and black
run: pip3 install 2to3 protobuf black

- name: Check out latest Vlsir dependencies
working-directory: layout21protos
run: |
git clone https://github.com/Vlsir/Vlsir.git vlsir
cd vlsir
scripts/build.sh
cd -
# - name: Check out latest Vlsir dependencies
# working-directory: layout21protos
# run: |
# git clone https://github.com/Vlsir/Vlsir.git vlsir
# cd vlsir
# scripts/build.sh
# cd -

- name: Run cargo test
run: cargo test --all --verbose -- --show-output
Expand Down
21 changes: 20 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[workspace]
#
# Layout21 Workspace
#

[workspace]
members = [
"gds21",
"layout21",
Expand All @@ -10,3 +13,19 @@ members = [
"layout21utils",
"lef21",
]

# Inherited Package Attributes
# Thanks https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table!
[workspace.package]
authors = ["Dan Fritchman <[email protected]>", "Arya Reais-Parsi <[email protected]>"]
categories = [] # FIXME!
documentation = "https://github.com/dan-fritchman/Layout21"
edition = "2021"
exclude = ["resources", "scratch"]
homepage = "https://github.com/dan-fritchman/Layout21"
include = []
keywords = [] # FIXME!
license = "BSD-3-Clause"
readme = "readme.md"
repository = "https://github.com/dan-fritchman/Layout21"
version = "3.0.0-pre.2"
23 changes: 16 additions & 7 deletions gds21/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
[package]
description = "Gds21 Integrated Circuit Layout Parser & Writer"
name = "gds21"

# Shared layout21 attributes
authors = ["Dan Fritchman <[email protected]>"]
edition = "2021"
license = "BSD-3-Clause"
repository = "https://github.com/dan-fritchman/Layout21"
version = "0.2.1"
authors.workspace = true
categories.workspace = true
documentation.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
include.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
version.workspace = true
workspace = "../"
exclude = ["resources",]

[dependencies]
# Local workspace dependencies
layout21utils = {path = "../layout21utils", version="0.2.1"}
layout21utils = {path = "../layout21utils", version = "3.0.0-pre.2"}

# External dependencies
byteorder = "1.3.4"
chrono = {version = "0.4.20", features = ["serde"]}
derive_builder = "0.9.0"
derive_more = "0.99.16"
num-derive = "0.3"
num-traits = "0.2"
schemars = {version = "0.8.10"}
serde = {version = "1.0", features = ["derive"]}
serde_derive = "1.0.88"
serde_json = "1.0"
Expand Down
28 changes: 27 additions & 1 deletion gds21/resources/empty.gds.json
Original file line number Diff line number Diff line change
@@ -1 +1,27 @@
{"name":"empty","version":3,"dates":{"modified":{"DateTime":"1970-01-01T00:00:01"},"accessed":{"DateTime":"1970-01-01T00:00:01"}},"units":[0.001,1e-9],"structs":[]}
{
"name": "empty",
"version": 3,
"dates": {
"modified": {
"year": 70,
"month": 1,
"day": 1,
"hour": 0,
"minute": 0,
"second": 1
},
"accessed": {
"year": 70,
"month": 1,
"day": 1,
"hour": 0,
"minute": 0,
"second": 1
}
},
"units": [
0.001,
1e-9
],
"structs": []
}
Loading