From 32aad0e21fc4632d578a8e8cf4f26bec656efebc Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Mon, 17 Jul 2023 13:03:42 +0200 Subject: [PATCH 1/9] Add changes for #298 to the documentation --- docs/source/changelog.rst | 5 +++++ docs/source/changes/298.pin_pydantic_version1.yaml | 9 +++++++++ 2 files changed, 14 insertions(+) create mode 100644 docs/source/changes/298.pin_pydantic_version1.yaml diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 0f43080b..59b56837 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -14,6 +14,11 @@ Deprecated * Minimal Python version is 3.8 +Fixed +----- + +* Pin TARDIS to use pydantic version 1 + [0.7.1] - 2023-05-16 ==================== diff --git a/docs/source/changes/298.pin_pydantic_version1.yaml b/docs/source/changes/298.pin_pydantic_version1.yaml new file mode 100644 index 00000000..c7f4f9e5 --- /dev/null +++ b/docs/source/changes/298.pin_pydantic_version1.yaml @@ -0,0 +1,9 @@ +category: fixed +summary: "Pin TARDIS to use pydantic version 1" +description: | + TARDIS supports at the moment only pydantic version 1, hence we are pinning the utilization of pydantic version 1 in + `setup.py`. +issues: +- 299 +pull requests: +- 298 From a546ee83bc9b6410be89d8b6def0f87ccaa8bb9c Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Wed, 19 Jul 2023 09:29:30 +0200 Subject: [PATCH 2/9] Add change log for #301 --- docs/source/changelog.rst | 1 + docs/source/changes/301.fix_prometheus_plugin.yaml | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 docs/source/changes/301.fix_prometheus_plugin.yaml diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 59b56837..c09377ad 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -18,6 +18,7 @@ Fixed ----- * Pin TARDIS to use pydantic version 1 +* Fix missing `resource_status` attribute crashing Prometheus plugin on newly started drones [0.7.1] - 2023-05-16 ==================== diff --git a/docs/source/changes/301.fix_prometheus_plugin.yaml b/docs/source/changes/301.fix_prometheus_plugin.yaml new file mode 100644 index 00000000..64f77b03 --- /dev/null +++ b/docs/source/changes/301.fix_prometheus_plugin.yaml @@ -0,0 +1,9 @@ +category: fixed +summary: "Fix missing `resource_status` attribute crashing Prometheus plugin on newly started drones" +description: | + Newly started drones were missing the `resource_status` attribute in the `resource_attributes` dictionary which led + to crashes in the Prometheus plugin. +issues: +- 297 +pull requests: +- 301 From 24369e7a3e566e551eff5a12316f8a1a3803f338 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Mon, 31 Jul 2023 15:53:04 +0200 Subject: [PATCH 3/9] Bump version to 0.8.0 --- tardis/__about__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tardis/__about__.py b/tardis/__about__.py index 7ed584e1..fbb511e8 100644 --- a/tardis/__about__.py +++ b/tardis/__about__.py @@ -3,7 +3,7 @@ __summary__ = "Transparent Adaptive Resource Dynamic Integration System" __url__ = "https://github.com/matterminers/tardis" -__version__ = "0.7.1" +__version__ = "0.8.0" __author__ = "Manuel Giffels, Matthias Schnepf" __email__ = "giffels@gmail.com" __copyright__ = "2018 - 2023 %s and Contributors" % __author__ From 0709107abd78b06e749a1add16941976e23043a3 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Fri, 4 Aug 2023 11:39:02 +0200 Subject: [PATCH 4/9] Add change log for #306 --- docs/source/changelog.rst | 1 + .../source/changes/306.fix_auditor_error_handling.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 docs/source/changes/306.fix_auditor_error_handling.yaml diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index c09377ad..505fb8d2 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -17,6 +17,7 @@ Deprecated Fixed ----- +* Fix auditor error handling when updating non-existing record * Pin TARDIS to use pydantic version 1 * Fix missing `resource_status` attribute crashing Prometheus plugin on newly started drones diff --git a/docs/source/changes/306.fix_auditor_error_handling.yaml b/docs/source/changes/306.fix_auditor_error_handling.yaml new file mode 100644 index 00000000..e5b4172c --- /dev/null +++ b/docs/source/changes/306.fix_auditor_error_handling.yaml @@ -0,0 +1,10 @@ +category: fixed +summary: "Fix auditor error handling when updating non-existing record" +description: | + It can happen that a drone is submitted but never reaches the AvailableState, since demand for resources is decreasing + and the drone is cleaned-up before and it reaches DownState. This case is currently not handled correctly in the + auditor plugin, since it tries to update a non-existing record. +issues: + - 305 +pull requests: + - 306 From af93bf238430c069ed78d99b0c930a2cc2978ab4 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Tue, 8 Aug 2023 09:44:40 +0200 Subject: [PATCH 5/9] Add change log for #308 --- docs/source/changes/308.deprecate_lancium_support.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docs/source/changes/308.deprecate_lancium_support.yaml diff --git a/docs/source/changes/308.deprecate_lancium_support.yaml b/docs/source/changes/308.deprecate_lancium_support.yaml new file mode 100644 index 00000000..94a86ece --- /dev/null +++ b/docs/source/changes/308.deprecate_lancium_support.yaml @@ -0,0 +1,7 @@ +category: deprecated +summary: "Lancium compute support" +description: | + Since April 2023 Lancium compute does not offer Platform as a Service anymore, therefore the support of Lancium + compute in TARDIS is now deprecated. +pull requests: + - 308 From 88c07f13a43d1d29e779b1bf652c5041cf129cfa Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Tue, 15 Aug 2023 09:48:50 +0200 Subject: [PATCH 6/9] Add CITATION.cff file to cite TARDIS correctly --- CITATION.cff | 46 +++++++++++++++++++++++++++++++++++++++ docs/source/changelog.rst | 11 +++++----- 2 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 CITATION.cff diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 00000000..9ef755ae --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,46 @@ +# YAML 1.2 +# Metadata for citation of this software according to the CFF format (https://citation-file-format.github.io/) +cff-version: 1.1.0 +message: If you use this software, please cite it using these metadata. +title: "MatterMiners/tardis: 0.7.1" +doi: 10.5281/zenodo.7943895 +authors: + - given-names: Manuel + family-names: Giffels + affiliation: Karlsruhe Institute of Technology + orcid: https://orcid.org/0000-0003-0193-3032 + - given-names: Max + family-names: Fischer + affiliation: Karlsruhe Institute of Technology + - given-names: Alexander + family-names: Haas + - given-names: Stefan + family-names: Kroboth + affiliation: University of Freiburg + - given-names: Matthias + family-names: Schnepf + affiliation: Karlsruhe Institute of Technology + - given-names: Eileen + family-names: Kuehn + affiliation: Karlsruhe Institute of Technology + - given-names: Pascal + family-names: Schuhmacher + - given-names: Rene + family-names: Caspart + affiliation: Karlsruhe Institute of Technology + - given-names: Florian + family-names: von Cube + affiliation: Karlsruhe Institute of Technology + - given-names: Dirk + family-names: Sammel + affiliation: University of Freiburg + - given-names: Benjamin + family-names: Rottler + affiliation: University of Freiburg + - given-names: Peter + family-names: Wienemann + affiliation: University of Bonn +version: 0.7.1 +date-released: 2023-05-17 +repository-code: https://github.com/MatterMiners/tardis +license: MIT diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 505fb8d2..7a84ecd0 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -9,11 +9,6 @@ CHANGELOG [Unreleased] - 2023-10-04 ========================= -Deprecated ----------- - -* Minimal Python version is 3.8 - Fixed ----- @@ -21,6 +16,12 @@ Fixed * Pin TARDIS to use pydantic version 1 * Fix missing `resource_status` attribute crashing Prometheus plugin on newly started drones +Deprecated +---------- + +* Minimal Python version is 3.8 +* Lancium compute support + [0.7.1] - 2023-05-16 ==================== From a250bc418f568e3ee3abb881f61e6e8db06bfd19 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Thu, 5 Oct 2023 14:26:46 +0200 Subject: [PATCH 7/9] Add change log for #307 --- CONTRIBUTORS | 2 +- docs/source/changelog.rst | 5 +++-- .../307.fix_updated_timestamp_utilization.yaml | 13 +++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 docs/source/changes/307.fix_updated_timestamp_utilization.yaml diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 64a91b0d..370201a2 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -12,8 +12,8 @@ Leon Schuhmacher R. Florian von Cube mschnepf Alexander Haas <104835302+haasal@users.noreply.github.com> -mschnepf Benjamin Rottler +mschnepf Dirk Sammel Matthias J. Schnepf Matthias Schnepf diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 7a84ecd0..358fe1de 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,4 +1,4 @@ -.. Created by changelog.py at 2023-10-04, command +.. Created by changelog.py at 2023-10-05, command '/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-python3.10/bin/changelog docs/source/changes compile --categories Added Changed Fixed Security Deprecated --output=docs/source/changelog.rst' based on the format of 'https://keepachangelog.com/' @@ -6,7 +6,7 @@ CHANGELOG ######### -[Unreleased] - 2023-10-04 +[Unreleased] - 2023-10-05 ========================= Fixed @@ -15,6 +15,7 @@ Fixed * Fix auditor error handling when updating non-existing record * Pin TARDIS to use pydantic version 1 * Fix missing `resource_status` attribute crashing Prometheus plugin on newly started drones +* Fix utilization of updated timestamp and potential ignoring of drone minimum lifetime Deprecated ---------- diff --git a/docs/source/changes/307.fix_updated_timestamp_utilization.yaml b/docs/source/changes/307.fix_updated_timestamp_utilization.yaml new file mode 100644 index 00000000..62230025 --- /dev/null +++ b/docs/source/changes/307.fix_updated_timestamp_utilization.yaml @@ -0,0 +1,13 @@ +category: fixed +summary: "Fix utilization of updated timestamp and potential ignoring of drone minimum lifetime" +description: | + The original idea was that created and updated timestamps indicate a change + of the `DroneState`. However, in the meantime it was also updated in some + SiteAdapters, when the resource status changed, e.g. through a + `resource_status` call on certain SiteAdapters. Through the + `drone_minimum_lifetime` setting seems to be ignored, because `resource_status` + is called every minute, while `drone_minimum_lifetime` is usually in the order of hours. +issues: + - 296 +pull requests: + - 307 From 2dc9a999310b2242ba0dd9ae25bd15474e23a078 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Thu, 5 Oct 2023 14:30:28 +0200 Subject: [PATCH 8/9] Add change log for #311 --- docs/source/changelog.rst | 5 +++++ .../source/changes/311.bump_pyauditor_version_to_0_2_0.yaml | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 docs/source/changes/311.bump_pyauditor_version_to_0_2_0.yaml diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 358fe1de..9faec200 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -9,6 +9,11 @@ CHANGELOG [Unreleased] - 2023-10-05 ========================= +Changed +------- + +* Bump pyauditor version to 0.2.0 + Fixed ----- diff --git a/docs/source/changes/311.bump_pyauditor_version_to_0_2_0.yaml b/docs/source/changes/311.bump_pyauditor_version_to_0_2_0.yaml new file mode 100644 index 00000000..b3f61be9 --- /dev/null +++ b/docs/source/changes/311.bump_pyauditor_version_to_0_2_0.yaml @@ -0,0 +1,6 @@ +category: changed +summary: "Bump pyauditor version to 0.2.0" +description: | + Bump `pyauditor` to version 0.2.0 +pull requests: +- 311 From 779159c79371267c8ea2183cbc0e263cbcd8f6b9 Mon Sep 17 00:00:00 2001 From: Manuel Giffels Date: Thu, 5 Oct 2023 14:40:16 +0200 Subject: [PATCH 9/9] Create tardis release 0.8.0 --- docs/source/changelog.rst | 4 ++-- .../changes/298.pin_pydantic_version1.yaml | 6 +++--- .../changes/301.fix_prometheus_plugin.yaml | 4 +++- .../changes/304.deprecate_python_36_37.yaml | 7 ++++--- .../306.fix_auditor_error_handling.yaml | 13 ++++++------ ...307.fix_updated_timestamp_utilization.yaml | 21 ++++++++++--------- .../308.deprecate_lancium_support.yaml | 8 +++---- .../311.bump_pyauditor_version_to_0_2_0.yaml | 1 + docs/source/changes/versions.yaml | 2 ++ 9 files changed, 37 insertions(+), 29 deletions(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 9faec200..6c082b4c 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -6,8 +6,8 @@ CHANGELOG ######### -[Unreleased] - 2023-10-05 -========================= +[0.8.0] - 2023-10-05 +==================== Changed ------- diff --git a/docs/source/changes/298.pin_pydantic_version1.yaml b/docs/source/changes/298.pin_pydantic_version1.yaml index c7f4f9e5..f93d400d 100644 --- a/docs/source/changes/298.pin_pydantic_version1.yaml +++ b/docs/source/changes/298.pin_pydantic_version1.yaml @@ -1,9 +1,9 @@ category: fixed summary: "Pin TARDIS to use pydantic version 1" -description: | - TARDIS supports at the moment only pydantic version 1, hence we are pinning the utilization of pydantic version 1 in - `setup.py`. +description: "TARDIS supports at the moment only pydantic version 1, hence we are\ + \ pinning the utilization of pydantic version 1 in \n`setup.py`.\n" issues: - 299 pull requests: - 298 +version: 0.8.0 diff --git a/docs/source/changes/301.fix_prometheus_plugin.yaml b/docs/source/changes/301.fix_prometheus_plugin.yaml index 64f77b03..f04a45ed 100644 --- a/docs/source/changes/301.fix_prometheus_plugin.yaml +++ b/docs/source/changes/301.fix_prometheus_plugin.yaml @@ -1,5 +1,6 @@ category: fixed -summary: "Fix missing `resource_status` attribute crashing Prometheus plugin on newly started drones" +summary: "Fix missing `resource_status` attribute crashing Prometheus plugin on newly\ + \ started drones" description: | Newly started drones were missing the `resource_status` attribute in the `resource_attributes` dictionary which led to crashes in the Prometheus plugin. @@ -7,3 +8,4 @@ issues: - 297 pull requests: - 301 +version: 0.8.0 diff --git a/docs/source/changes/304.deprecate_python_36_37.yaml b/docs/source/changes/304.deprecate_python_36_37.yaml index 77ac6671..fdd94bf2 100644 --- a/docs/source/changes/304.deprecate_python_36_37.yaml +++ b/docs/source/changes/304.deprecate_python_36_37.yaml @@ -4,7 +4,8 @@ description: | Support for Python versions 3.6 and 3.7 has been depracted. This has no further functional changes for users but reflects the end of life of these versions and allows TARDIS and plugins to drop outdated dependencies and compatibility layers. -pull requests: - - 304 issues: - - 303 +- 303 +pull requests: +- 304 +version: 0.8.0 diff --git a/docs/source/changes/306.fix_auditor_error_handling.yaml b/docs/source/changes/306.fix_auditor_error_handling.yaml index e5b4172c..f1294a62 100644 --- a/docs/source/changes/306.fix_auditor_error_handling.yaml +++ b/docs/source/changes/306.fix_auditor_error_handling.yaml @@ -1,10 +1,11 @@ category: fixed summary: "Fix auditor error handling when updating non-existing record" -description: | - It can happen that a drone is submitted but never reaches the AvailableState, since demand for resources is decreasing - and the drone is cleaned-up before and it reaches DownState. This case is currently not handled correctly in the - auditor plugin, since it tries to update a non-existing record. +description: "It can happen that a drone is submitted but never reaches the AvailableState,\ + \ since demand for resources is decreasing\nand the drone is cleaned-up before and\ + \ it reaches DownState. This case is currently not handled correctly in the \nauditor\ + \ plugin, since it tries to update a non-existing record.\n" issues: - - 305 +- 305 pull requests: - - 306 +- 306 +version: 0.8.0 diff --git a/docs/source/changes/307.fix_updated_timestamp_utilization.yaml b/docs/source/changes/307.fix_updated_timestamp_utilization.yaml index 62230025..c4108a46 100644 --- a/docs/source/changes/307.fix_updated_timestamp_utilization.yaml +++ b/docs/source/changes/307.fix_updated_timestamp_utilization.yaml @@ -1,13 +1,14 @@ category: fixed -summary: "Fix utilization of updated timestamp and potential ignoring of drone minimum lifetime" -description: | - The original idea was that created and updated timestamps indicate a change - of the `DroneState`. However, in the meantime it was also updated in some - SiteAdapters, when the resource status changed, e.g. through a - `resource_status` call on certain SiteAdapters. Through the - `drone_minimum_lifetime` setting seems to be ignored, because `resource_status` - is called every minute, while `drone_minimum_lifetime` is usually in the order of hours. +summary: "Fix utilization of updated timestamp and potential ignoring of drone minimum\ + \ lifetime" +description: "The original idea was that created and updated timestamps indicate a\ + \ change \nof the `DroneState`. However, in the meantime it was also updated in\ + \ some \nSiteAdapters, when the resource status changed, e.g. through a \n`resource_status`\ + \ call on certain SiteAdapters. Through the \n`drone_minimum_lifetime` setting seems\ + \ to be ignored, because `resource_status` \nis called every minute, while `drone_minimum_lifetime`\ + \ is usually in the order of hours.\n" issues: - - 296 +- 296 pull requests: - - 307 +- 307 +version: 0.8.0 diff --git a/docs/source/changes/308.deprecate_lancium_support.yaml b/docs/source/changes/308.deprecate_lancium_support.yaml index 94a86ece..0b2caf63 100644 --- a/docs/source/changes/308.deprecate_lancium_support.yaml +++ b/docs/source/changes/308.deprecate_lancium_support.yaml @@ -1,7 +1,7 @@ category: deprecated summary: "Lancium compute support" -description: | - Since April 2023 Lancium compute does not offer Platform as a Service anymore, therefore the support of Lancium - compute in TARDIS is now deprecated. +description: "Since April 2023 Lancium compute does not offer Platform as a Service\ + \ anymore, therefore the support of Lancium \ncompute in TARDIS is now deprecated.\n" pull requests: - - 308 +- 308 +version: 0.8.0 diff --git a/docs/source/changes/311.bump_pyauditor_version_to_0_2_0.yaml b/docs/source/changes/311.bump_pyauditor_version_to_0_2_0.yaml index b3f61be9..c51ae18f 100644 --- a/docs/source/changes/311.bump_pyauditor_version_to_0_2_0.yaml +++ b/docs/source/changes/311.bump_pyauditor_version_to_0_2_0.yaml @@ -4,3 +4,4 @@ description: | Bump `pyauditor` to version 0.2.0 pull requests: - 311 +version: 0.8.0 diff --git a/docs/source/changes/versions.yaml b/docs/source/changes/versions.yaml index 4609f20d..702434a8 100644 --- a/docs/source/changes/versions.yaml +++ b/docs/source/changes/versions.yaml @@ -1,3 +1,5 @@ +- semver: 0.8.0 + date: '2023-10-05' - semver: 0.7.1 date: '2023-05-16' - semver: 0.7.0