diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index 153478afe55665d65765940dc5c83d8da471e65e..cea631ddbf57bdb7101bb6d0bfe9a20aff9a081d 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -34,7 +34,7 @@ set(PACKAGE "ISIS") set(PACKAGE_NAME "USGS ISIS") # Version number -set(VERSION "7.2.0") +set(VERSION "8.0.0") string(REPLACE "." ";" VERSION_LIST ${VERSION}) list(GET VERSION_LIST 0 VERSION_MAJOR) list(GET VERSION_LIST 1 VERSION_MINOR) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fabd2b38e46b1268da1e9f631b602806107afaa8..3a08b876d8bac085f9d87ef4cdddb4c3285a7ac9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ # 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 = "8.0.0_RC1" %} # 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 @@ -44,9 +44,7 @@ build: # Shotgun strat on requirements until we can narrow them down requirements: - build: - ale=0.8.6 - - aom - armadillo - boost=1.72 - boost-cpp=1.72 @@ -54,21 +52,20 @@ requirements: - usgs-astrogeology::bullet - bz2file - bzip2 - - cmake>=3.15 + - cmake >=3.15 - cspice=67 - 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 + - eigen < 3.4 + - embree>=2.17,<3 - ffmpeg - - geos>=3.7,<3.8 + - geos>=3.9,<3.10 - geotiff - gmp - graphviz - - gsl>=2.6,<2.7 + - gsl>=2.6 - hdf5 - icu - inja @@ -89,12 +86,12 @@ requirements: - nlohmann_json - ninja==1.7.2 - nn - - numpy=1.23 - opencv>=4.5.2 - openssl>=1.1.1k - - pcl>=1.10.0 + - pcl >= 1.10.0 - protobuf<3.20 - python>=3.7.11 + - pytest - rclone - qhull - qt>=5.9.6,<5.15.0 @@ -106,7 +103,6 @@ requirements: - texlive-core - tnt - x264 - - x265 - xalan-c - xerces-c=3 - xorg-kbproto @@ -160,6 +156,7 @@ requirements: - qhull - {{ pin_compatible('qt', max_pin='x.x') }} - {{ pin_compatible('qwt', max_pin='x.x') }} + - rclone - superlu - tnt - x264