From c66f65dca4500a27b27dbdeac0ae6766057eff89 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Thu, 6 May 2021 11:33:44 +0100 Subject: [PATCH] Release v3.0.0 (#735) * fix news file path * improve error message in update-changelog * update changelog * bump versions for release * add npm lockfile to gitignore --- .gitignore | 3 +++ CHANGELOG.md | 31 ++++++++++++++++++++++++++++++- README.md | 2 +- news/702-feature.md | 3 --- news/707-bugfix.md | 3 --- news/713-feature.md | 1 - news/714-bugfix.md | 1 - news/715-bugfix.md | 1 - news/722-bugfix.md | 2 -- news/734-feature.md | 1 - src/SharedAssemblyInfo.cs | 6 +++--- utils/update-changelog.py | 5 ++++- 12 files changed, 41 insertions(+), 18 deletions(-) delete mode 100644 news/702-feature.md delete mode 100644 news/707-bugfix.md delete mode 100644 news/713-feature.md delete mode 100644 news/714-bugfix.md delete mode 100644 news/715-bugfix.md delete mode 100644 news/722-bugfix.md delete mode 100644 news/734-feature.md diff --git a/.gitignore b/.gitignore index 3997bfa7c..6a7def0d0 100644 --- a/.gitignore +++ b/.gitignore @@ -315,3 +315,6 @@ global.json venv/ *.egg-info/ + +# for prettier in scripts/update-changelog.py +package-lock.json diff --git a/CHANGELOG.md b/CHANGELOG.md index a370c931d..51241c228 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,34 @@ A raw git diff can be seen [here][unreleased]. +## [3.0.0] 2021-05-06 + +## Feature + +- [#702](https://github.com/SMI/SmiServices/pull/702) by rkm. Replace Java + ExtractorCLI with C# ExtractImages service + - _Breaking_ Existing scripts and documentation + - _Breaking_ Change ExtractorClOptions -> ExtractImagesOptions in YAML + configs +- [#713](https://github.com/SMI/SmiServices/pull/713) by rkm. Upgrade all + projects and related CI scripts to `net5`. +- [#734](https://github.com/SMI/SmiServices/pull/734) by tznind. Updated to + RDMP 5.0.0 (and Dicom Plugin 3.0.0) + +## Bugfix + +- [#708](https://github.com/SMI/SmiServices/pull/708) by rkm. Add nuget.config + file to fix flaky issues with Azure CI Runners. Ref: + - https://github.com/NuGet/Home/issues/10586 + - https://github.com/actions/virtual-environments/issues/3038 +- [#714](https://github.com/SMI/SmiServices/pull/714) by rkm. Fixup current + LGTM alerts. +- [#715](https://github.com/SMI/SmiServices/pull/715) by rkm. Revert to the + hack-y method of fixing the Nuget cache for Azure Windows agents. +- [#722](https://github.com/SMI/SmiServices/pull/722) by rkm. Remove + workaround for Windows agents in Azure CI since fixed upstream. Ref: + - https://github.com/actions/virtual-environments/issues/3038 + ## [2.1.1] 2021-04-07 ## Bugfix @@ -792,7 +820,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/v2.1.1...master +[unreleased]: https://github.com/SMI/SmiServices/compare/v3.0.0...master +[3.0.0]: https://github.com/SMI/SmiServices/compare/v2.1.1...v3.0.0 [2.1.1]: https://github.com/SMI/SmiServices/compare/v2.1.0...v2.1.1 [2.1.0]: https://github.com/SMI/SmiServices/compare/v2.0.0...v2.1.0 [2.0.0]: https://github.com/SMI/SmiServices/compare/v1.15.1...v2.0.0 diff --git a/README.md b/README.md index 155ce1d72..4b42e02d4 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ [![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: `2.1.1` +Version: `3.0.0` # SMI Services diff --git a/news/702-feature.md b/news/702-feature.md deleted file mode 100644 index 89e936435..000000000 --- a/news/702-feature.md +++ /dev/null @@ -1,3 +0,0 @@ -Replace Java ExtractorCLI with C# ExtractImages service -- *Breaking* Existing scripts and documentation -- *Breaking& Change ExtractorClOptions -> ExtractImagesOptions in YAML configs diff --git a/news/707-bugfix.md b/news/707-bugfix.md deleted file mode 100644 index 117f1fea0..000000000 --- a/news/707-bugfix.md +++ /dev/null @@ -1,3 +0,0 @@ -Add nuget.config file to fix flaky issues with Azure CI Runners. Ref: -- https://github.com/NuGet/Home/issues/10586 -- https://github.com/actions/virtual-environments/issues/3038 diff --git a/news/713-feature.md b/news/713-feature.md deleted file mode 100644 index ec34a0726..000000000 --- a/news/713-feature.md +++ /dev/null @@ -1 +0,0 @@ -Upgrade all projects and related CI scripts to `net5`. diff --git a/news/714-bugfix.md b/news/714-bugfix.md deleted file mode 100644 index 83a66cd82..000000000 --- a/news/714-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Fixup current LGTM alerts. diff --git a/news/715-bugfix.md b/news/715-bugfix.md deleted file mode 100644 index dd7ddcd18..000000000 --- a/news/715-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Revert to the hack-y method of fixing the Nuget cache for Azure Windows agents. diff --git a/news/722-bugfix.md b/news/722-bugfix.md deleted file mode 100644 index fe0398608..000000000 --- a/news/722-bugfix.md +++ /dev/null @@ -1,2 +0,0 @@ -Remove workaround for Windows agents in Azure CI since fixed upstream. Ref: -- https://github.com/actions/virtual-environments/issues/3038 diff --git a/news/734-feature.md b/news/734-feature.md deleted file mode 100644 index beca835a8..000000000 --- a/news/734-feature.md +++ /dev/null @@ -1 +0,0 @@ -Updated to RDMP 5.0.0 (and Dicom Plugin 3.0.0) \ No newline at end of file diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index 4c91e4872..2c27fc89d 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -7,6 +7,6 @@ [assembly: AssemblyCulture("")] // These should be overwritten by release builds -[assembly: AssemblyVersion("2.1.1")] -[assembly: AssemblyFileVersion("2.1.1")] -[assembly: AssemblyInformationalVersion("2.1.1")] // This one can have the extra build info after it +[assembly: AssemblyVersion("3.0.0")] +[assembly: AssemblyFileVersion("3.0.0")] +[assembly: AssemblyInformationalVersion("3.0.0")] // This one can have the extra build info after it diff --git a/utils/update-changelog.py b/utils/update-changelog.py index 8cc231a40..8fece9dab 100755 --- a/utils/update-changelog.py +++ b/utils/update-changelog.py @@ -42,7 +42,10 @@ def _get_pr_author(pr_ref: int) -> str: f"{_ORG}/{_REPO}/" f"pulls/{pr_ref}" ) - resp = urllib.request.urlopen(url) + try: + resp = urllib.request.urlopen(url) + except urllib.error.HTTPError as e: + raise Exception(f"Could not open {url}") from e data = json.loads(resp.read().decode()) return data["user"]["login"]