From c22e65c7a3ca70094009d939001d90228d12566f Mon Sep 17 00:00:00 2001 From: Adam Greig Date: Sat, 15 Jan 2022 19:29:42 +0000 Subject: [PATCH 1/4] Prepare for Python 0.1.21 and Rust 0.2.0 --- .gitattributes | 2 ++ CHANGELOG.md => CHANGELOG-python.md | 13 ++++++++++--- CHANGELOG-rust.md | 19 +++++++++++++++++++ svdtools/VERSION | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 .gitattributes rename CHANGELOG.md => CHANGELOG-python.md (94%) create mode 100644 CHANGELOG-rust.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..24dd03e2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +CHANGELOG-rust.md merge=union +CHANGELOG-python.md merge=union diff --git a/CHANGELOG.md b/CHANGELOG-python.md similarity index 94% rename from CHANGELOG.md rename to CHANGELOG-python.md index 7283708d..5bdc9bea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG-python.md @@ -1,9 +1,15 @@ # Changelog +This changelog tracks the Python `svdtools` project. See +[CHANGELOG-rust.md](CHANGELOG-rust.md) for the Rust `svdtools` project. + ## [Unreleased] -* Provide option to opt out of regex replace of 0's in description when creating arrays -* Add `_clear_fields` in `Device` and `Peripheral` +## [v0.1.21] 2022-01-15 + +* Provide option to opt out of regex replace of 0's in description when + creating arrays (#90) +* Add `_clear_fields` in `Device` and `Peripheral` (#93) ## [v0.1.20] 2021-10-06 @@ -135,7 +141,8 @@ * Add `click` CLI, to call as `svd patch ` * Add packaging -[Unreleased]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.20...HEAD +[Unreleased]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.21...HEAD +[v0.1.21]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.20...v0.1.21 [v0.1.20]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.19...v0.1.20 [v0.1.19]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.18...v0.1.19 [v0.1.18]: https://github.com/stm32-rs/stm32-rs/compare/v0.1.17...v0.1.18 diff --git a/CHANGELOG-rust.md b/CHANGELOG-rust.md new file mode 100644 index 00000000..6b503bb0 --- /dev/null +++ b/CHANGELOG-rust.md @@ -0,0 +1,19 @@ +# Changelog + +This changelog tracks the Rust `svdtools` project. See +[CHANGELOG-python.md](CHANGELOG-python.md) for the Python `svdtools` project. + +## [Unreleased] + +## [v0.2.0] 2022-01-15 + +* Add `_clear_fields` in `Device` and `Peripheral` (#90) +* Add new `convert` command to convert between SVD (XML), JSON, and YAML (#92) + +## [v0.1.0] 2021-12-09 + +* Initial release with feature-parity with the Python project. + +[Unreleased]: https://github.com/stm32-rs/stm32-rs/compare/v0.2.0...HEAD +[v0.2.0]: https://github.com/stm32-rs/svdtools/compare/35c3a79...v0.2.0 +[v0.1.0]: https://github.com/stm32-rs/svdtools/pull/84 diff --git a/svdtools/VERSION b/svdtools/VERSION index baa98378..79062996 100644 --- a/svdtools/VERSION +++ b/svdtools/VERSION @@ -1 +1 @@ -0.1.20 +0.1.21 From 075fac692bfaa4ec3972cfef8f262a98edd27c4b Mon Sep 17 00:00:00 2001 From: Andrey Zgarbul Date: Sat, 15 Jan 2022 23:12:46 +0300 Subject: [PATCH 2/4] fix Cargo.toml --- CHANGELOG-rust.md | 1 + Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-rust.md b/CHANGELOG-rust.md index 6b503bb0..0809f087 100644 --- a/CHANGELOG-rust.md +++ b/CHANGELOG-rust.md @@ -7,6 +7,7 @@ This changelog tracks the Rust `svdtools` project. See ## [v0.2.0] 2022-01-15 +* Use `svd-parser` 0.13.1 * Add `_clear_fields` in `Device` and `Peripheral` (#90) * Add new `convert` command to convert between SVD (XML), JSON, and YAML (#92) diff --git a/Cargo.toml b/Cargo.toml index 7da24c9b..7ac65a1a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,10 +20,10 @@ keywords = [ ] license = "MIT OR Apache-2.0" readme = "README.md" -include = ["/res", "/src", "/tests", "CHANGELOG.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"] +include = ["/res", "/src", "/tests", "CHANGELOG-rust.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"] edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +# See more keys and tCHANGELOG-rust.mdheir definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] clap = { version = "3.0", features = ["derive"] } From b0f2e2b62ef023c7c3343fdbd2628a67763d17c1 Mon Sep 17 00:00:00 2001 From: Adam Greig Date: Sun, 16 Jan 2022 01:22:24 +0000 Subject: [PATCH 3/4] Fix Cargo.toml --- Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7ac65a1a..f36f48b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,6 @@ readme = "README.md" include = ["/res", "/src", "/tests", "CHANGELOG-rust.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"] edition = "2021" -# See more keys and tCHANGELOG-rust.mdheir definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] clap = { version = "3.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } From 665febdcdecd0ca2411c1311e373c78ea41a3994 Mon Sep 17 00:00:00 2001 From: Adam Greig Date: Sun, 16 Jan 2022 02:19:08 +0000 Subject: [PATCH 4/4] Add new description-processing in arrays to changelog --- CHANGELOG-python.md | 2 +- CHANGELOG-rust.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-python.md b/CHANGELOG-python.md index 5bdc9bea..382ac1da 100644 --- a/CHANGELOG-python.md +++ b/CHANGELOG-python.md @@ -8,7 +8,7 @@ This changelog tracks the Python `svdtools` project. See ## [v0.1.21] 2022-01-15 * Provide option to opt out of regex replace of 0's in description when - creating arrays (#90) + creating arrays by using a custom `description` attribute (#90, #95) * Add `_clear_fields` in `Device` and `Peripheral` (#93) ## [v0.1.20] 2021-10-06 diff --git a/CHANGELOG-rust.md b/CHANGELOG-rust.md index 0809f087..00da4ac6 100644 --- a/CHANGELOG-rust.md +++ b/CHANGELOG-rust.md @@ -10,6 +10,8 @@ This changelog tracks the Rust `svdtools` project. See * Use `svd-parser` 0.13.1 * Add `_clear_fields` in `Device` and `Peripheral` (#90) * Add new `convert` command to convert between SVD (XML), JSON, and YAML (#92) +* Provide option to opt out of regex replace of 0's in description when + creating arrays by using a custom `description` attribute (#95) ## [v0.1.0] 2021-12-09