From dd24466d75a929c5b317df16c065766c9541442f Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Tue, 8 Nov 2022 19:34:00 +0000 Subject: [PATCH 1/4] add missing news file --- news/1261-meta.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/1261-meta.md diff --git a/news/1261-meta.md b/news/1261-meta.md new file mode 100644 index 000000000..450cc3204 --- /dev/null +++ b/news/1261-meta.md @@ -0,0 +1 @@ +Update caching strategy in CI From 57051a3ee723b868030c672764a239db0504a67d Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Tue, 8 Nov 2022 19:35:07 +0000 Subject: [PATCH 2/4] generate changelog --- CHANGELOG.md | 35 ++++++++++++++++++++++++++++++++++- news/1259-feature.md | 3 --- news/1261-meta.md | 1 - news/1270-change.md | 1 - news/1285-bugfix.md | 1 - news/1314-bugfix.md | 1 - news/1350-bugfix.md | 1 - 7 files changed, 34 insertions(+), 9 deletions(-) delete mode 100644 news/1259-feature.md delete mode 100644 news/1261-meta.md delete mode 100644 news/1270-change.md delete mode 100644 news/1285-bugfix.md delete mode 100644 news/1314-bugfix.md delete mode 100644 news/1350-bugfix.md diff --git a/CHANGELOG.md b/CHANGELOG.md index b886a307f..cf6d5e9f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,38 @@ A raw git diff can be seen [here][unreleased]. +## [5.3.0] 2022-11-08 + +## Feature + +- [#1259](https://github.com/SMI/SmiServices/pull/1259) by rkm. Add support + for extraction processing failures + - Remove `IsIdentifiable` field from `ExtractedFileVerificationMessage` + and replace with new `VerifiedFileStatus` enum + - Update extraction job classes in `CohortPackager` to store this new + field, and handle backwards-incompatibility when reading older + extraction logs + +## Bugfix + +- [#1285](https://github.com/SMI/SmiServices/pull/1285) by howff. Improve the + removal of HTML tags from StructuredReport (SR) text +- [#1314](https://github.com/SMI/SmiServices/pull/1314) by jas88. Replace + SharpCompress usage due to buggy LZMA handling to fix issue #1313 +- [#1350](https://github.com/SMI/SmiServices/pull/1350) by tznind. Fix + DicomRelationalMapper when running with a YamlRepository backend + +## Change + +- [#1270](https://github.com/SMI/SmiServices/pull/1270) by tznind. Rename yaml + config file `IsIdentifiableBaseOptions` to `IsIdentifiableOptions` and + removed unused CLI verbs in `smi` + +## Meta + +- [#1261](https://github.com/SMI/SmiServices/pull/1261) by jas88. Update + caching strategy in CI + ## [5.2.0] 2022-08-10 ## Feature @@ -1142,7 +1174,8 @@ First stable release after importing the repository from the private - Anonymous `MappingTableName` must now be fully specified to pass validation (e.g. `mydb.mytbl`). Previously skipping database portion was supported. -[unreleased]: https://github.com/SMI/SmiServices/compare/v5.2.0...master +[unreleased]: https://github.com/SMI/SmiServices/compare/v5.3.0...master +[5.3.0]: https://github.com/SMI/SmiServices/compare/v5.2.0...v5.3.0 [5.2.0]: https://github.com/SMI/SmiServices/compare/v5.1.3...v5.2.0 [5.1.3]: https://github.com/SMI/SmiServices/compare/v5.1.2...v5.1.3 [5.1.2]: https://github.com/SMI/SmiServices/compare/v5.1.1...v5.1.2 diff --git a/news/1259-feature.md b/news/1259-feature.md deleted file mode 100644 index ed0a7fe31..000000000 --- a/news/1259-feature.md +++ /dev/null @@ -1,3 +0,0 @@ -Add support for extraction processing failures -- Remove `IsIdentifiable` field from `ExtractedFileVerificationMessage` and replace with new `VerifiedFileStatus` enum -- Update extraction job classes in `CohortPackager` to store this new field, and handle backwards-incompatibility when reading older extraction logs \ No newline at end of file diff --git a/news/1261-meta.md b/news/1261-meta.md deleted file mode 100644 index 450cc3204..000000000 --- a/news/1261-meta.md +++ /dev/null @@ -1 +0,0 @@ -Update caching strategy in CI diff --git a/news/1270-change.md b/news/1270-change.md deleted file mode 100644 index d6a32e9a8..000000000 --- a/news/1270-change.md +++ /dev/null @@ -1 +0,0 @@ -Rename yaml config file `IsIdentifiableBaseOptions` to `IsIdentifiableOptions` and removed unused CLI verbs in `smi` \ No newline at end of file diff --git a/news/1285-bugfix.md b/news/1285-bugfix.md deleted file mode 100644 index 58ba74f4e..000000000 --- a/news/1285-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Improve the removal of HTML tags from StructuredReport (SR) text diff --git a/news/1314-bugfix.md b/news/1314-bugfix.md deleted file mode 100644 index d1646e3f9..000000000 --- a/news/1314-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Replace SharpCompress usage due to buggy LZMA handling to fix issue #1313 diff --git a/news/1350-bugfix.md b/news/1350-bugfix.md deleted file mode 100644 index 4acf721dc..000000000 --- a/news/1350-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Fix DicomRelationalMapper when running with a YamlRepository backend \ No newline at end of file From b7bd70ce4a2b277c8dfd64581e3d3860c15e5b87 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Tue, 8 Nov 2022 19:36:11 +0000 Subject: [PATCH 3/4] bump versions for release --- README.md | 2 +- src/SharedAssemblyInfo.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cc7efb6a7..a018b7560 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ![GitHub](https://img.shields.io/github/license/SMI/SmiServices) [![Total alerts](https://img.shields.io/lgtm/alerts/g/SMI/SmiServices.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/SMI/SmiServices/alerts/) -Version: `5.2.0` +Version: `5.3.0` # SMI Services diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index 772ddefec..2bcfd6e56 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -7,6 +7,6 @@ [assembly: AssemblyCulture("")] // These should be overwritten by release builds -[assembly: AssemblyVersion("5.2.0")] -[assembly: AssemblyFileVersion("5.2.0")] -[assembly: AssemblyInformationalVersion("5.2.0")] // This one can have the extra build info after it +[assembly: AssemblyVersion("5.3.0")] +[assembly: AssemblyFileVersion("5.3.0")] +[assembly: AssemblyInformationalVersion("5.3.0")] // This one can have the extra build info after it From 2070aa82bbbd36bf360a26520ae6717110f2bb1d Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Tue, 8 Nov 2022 19:39:45 +0000 Subject: [PATCH 4/4] update dependabot config --- .github/dependabot.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3fc91e390..81c950f76 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,7 +8,6 @@ updates: target-branch: master reviewers: - rkm - - tznind - jas88 - package-ecosystem: maven directory: "/src/common/com.smi.microservices.parent" @@ -18,7 +17,6 @@ updates: target-branch: master reviewers: - rkm - - tznind - jas88 - package-ecosystem: "github-actions" directory: "/" @@ -26,7 +24,6 @@ updates: interval: daily reviewers: - rkm - - tznind - jas88 - package-ecosystem: "pip" directory: "/src/common/Smi_Common_Python" @@ -34,11 +31,17 @@ updates: interval: daily allow: - dependency-type: "all" + reviewers: + - rkm + - jas88 - package-ecosystem: "pip" directory: "/src/applications/SRAnonTool" schedule: interval: daily allow: - dependency-type: "all" + reviewers: + - rkm + - jas88