From c8a1811651087b4ff3479674dafb1e3d772d3c06 Mon Sep 17 00:00:00 2001
From: Austin Sanders <arsanders@usgs.gov>
Date: Tue, 14 Mar 2023 10:35:03 -0600
Subject: [PATCH] Release prep (#5154)
* Release prep
* Pinned gsl to <2.7
---
environment.yml | 2 +-
isis/CMakeLists.txt | 2 +-
recipe/meta.yaml | 14 +++++---------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/environment.yml b/environment.yml
index 2cb8dbecea..025eb1b72a 100644
--- a/environment.yml
+++ b/environment.yml
@@ -24,7 +24,7 @@ dependencies:
- geotiff
- gmp
- graphviz
- - gsl>=2.6
+ - gsl>=2.6,<2.7
- hdf5
- icu
- inja
diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt
index cfe27ad888..6f02ec006c 100644
--- a/isis/CMakeLists.txt
+++ b/isis/CMakeLists.txt
@@ -46,7 +46,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${VERSION}")
# Other release information
string(TIMESTAMP VERSION_DATE "%Y-%m-%d" UTC)
-set(RELEASE_STAGE "beta") # (alpha, beta, stable)
+set(RELEASE_STAGE "stable") # (alpha, beta, stable)
# Define to the address where bug reports for this package should be sent.
set(PACKAGE_BUGREPORT "https://github.com/USGS-Astrogeology/ISIS3/issues")
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 486c9be61f..a941c0faac 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -18,12 +18,12 @@
# A Public Release for ISIS3.6.1: {% set version = "3.6.1" %}
# A Release Candidate for ISIS3.6.1: {% set version = "3.6.1_RC" %}
# A custom build of ISIS3.6.1 for the CaSSIS mission: {% set version = "3.6.1_cassis" %}
-{% set version = "7.2.0_RC1" %}
+{% set version = "7.2.0" %}
# This is the build number for the current version you are building. If this is the first build of
# this version, the build number will be 0. It is incremented by 1 with every consecutive build of
# the same version.
-{% set build_number = "1" %}
+{% set build_number = "0" %}
package:
name: isis
@@ -46,7 +46,6 @@ build:
requirements:
build:
- ale=0.8.6
- - aom
- armadillo
- boost=1.72
- boost-cpp=1.72
@@ -58,11 +57,10 @@ requirements:
- cspice
- csm>=3.0.3,<3.0.4
- curl
+ - cxx-compiler=1.1.2
- doxygen
- eigen<3.4
- # versioned due to major release of embree 3 on conda-forge
- # it is not compatible without changes to ISIS
- - embree>=2.17, <3
+ - embree>=2.17,<3
- ffmpeg
- geos>=3.7,<3.8
- geotiff
@@ -89,12 +87,12 @@ requirements:
- nlohmann_json
- ninja==1.7.2
- nn
- - numpy=1.23
- opencv>=4.5.2
- openssl>=1.1.1k
- pcl>=1.10.0
- protobuf<3.20
- python>=3.7.11
+ - pytest
- rclone
- qhull
- qt>=5.9.6,<5.15.0
@@ -106,7 +104,6 @@ requirements:
- texlive-core
- tnt
- x264
- - x265
- xalan-c
- xerces-c=3
- xorg-kbproto
@@ -119,7 +116,6 @@ requirements:
run:
- {{ pin_compatible('ale', max_pin='x.x.x') }}
- {{ pin_compatible('armadillo', max_pin='x.x.x') }}
- - {{ pin_compatible('aom', max_pin='x.x') }}
- {{ pin_compatible('boost', max_pin='x.x') }}
- {{ pin_compatible('boost-cpp', max_pin='x.x') }}
- blas
--
GitLab