From 2ae2483e27142ffaccc1115594b5dfc088677bf8 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Morin Date: Sat, 9 Dec 2023 11:12:00 -0500 Subject: [PATCH] Bump to 2.114.1 and add changelog Signed-off-by: Jean-Christophe Morin --- CHANGELOG.md | 8 ++++++++ release-rez.py | 2 +- src/rez/utils/_version.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c705fd1b0..c1c714408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ +## 2.114.1 (2023-12-09) +[Source](https://github.com/AcademySoftwareFoundation/rez/tree/2.114.1) | [Diff](https://github.com/AcademySoftwareFoundation/rez/compare/2.114.0...2.114.1) + +**Merged pull requests:** + +- Fix exception when deprecated settings appear in a user config [\#1595](https://github.com/AcademySoftwareFoundation/rez/pull/1595) ([JeanChristopheMorinPerso](https://github.com/JeanChristopheMorinPerso)) +- Add cross reference for package_cache_during_build in docs [\#1598](https://github.com/AcademySoftwareFoundation/rez/pull/1598) ([brycegbrazen](https://github.com/brycegbrazen)) + ## 2.114.0 (2023-11-23) [Source](https://github.com/AcademySoftwareFoundation/rez/tree/2.114.0) | [Diff](https://github.com/AcademySoftwareFoundation/rez/compare/2.113.0...2.114.0) diff --git a/release-rez.py b/release-rez.py index 92330ccae..166083914 100644 --- a/release-rez.py +++ b/release-rez.py @@ -11,7 +11,7 @@ import argparse import os from datetime import date -from rez.utils.py23 import quote +from shlex import quote import subprocess import sys diff --git a/src/rez/utils/_version.py b/src/rez/utils/_version.py index 8f6da3c54..58245d0ec 100644 --- a/src/rez/utils/_version.py +++ b/src/rez/utils/_version.py @@ -4,4 +4,4 @@ # Update this value to version up Rez. Do not place anything else in this file. # Using .devN allows us to run becnmarks and create proper benchmark reports on PRs. -_rez_version = "2.114.0" +_rez_version = "2.114.1"