From 033d619b76abce11056b5d21d69f67c2db9c2034 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 28 Nov 2022 11:37:55 -0700 Subject: [PATCH 1/3] pinning versions for qt depreciations --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index eaa3745b91..f3ce676f03 100644 --- a/environment.yml +++ b/environment.yml @@ -53,7 +53,7 @@ dependencies: - pytest - rclone - qhull - - qt>=5.9.6 + - qt>=5.9.6,<5.15.0 - qwt - sqlite - suitesparse From 60d57e40674ad1621b9e40ac14b3df116c641a16 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 28 Nov 2022 12:21:27 -0700 Subject: [PATCH 2/3] updated .zenodo.json --- .zenodo.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index 87502f5bff..979e82e547 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -204,6 +204,9 @@ { "name": "Heyer, Eric" }, + { + "name": "Hibl, Anton" + }, { "name": "Hilt, Noah" }, From bd6ee64b202014ca68371c4365d6e0e5a9d4bf10 Mon Sep 17 00:00:00 2001 From: antonhibl Date: Mon, 28 Nov 2022 12:24:03 -0700 Subject: [PATCH 3/3] updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77b504fba4..94ea986adb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ release. - Fixed compiler warnings on ubuntu [#4911](https://github.com/USGS-Astrogeology/ISIS3/issues/4911) - Fixes embree shape models not being from .BDS extension files [5064](https://github.com/USGS-Astrogeology/ISIS3/issues/5064) - Fixed failing shapemodel parameters when bullet was the preferred ray tracing engine but could not be created. [#5062](https://github.com/USGS-Astrogeology/ISIS3/issues/5062) +- Fixed version for Qt to prevent depreciations. [#5070](https://github.com/USGS-Astrogeology/ISIS3/issues/5070) ## [7.1.0] - 2022-07-27