diff --git a/CHANGELOG.md b/CHANGELOG.md index 855ea69467f41f1a46f30c66e126d709ec4e14fb..7ba39c3aefcb85d6cd5bd788e63bb4373a7dd15f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ release. - Removed the `.py` extention from the _isisdataeval_ tool `isisdata_mockup` for consistency and install it in $ISISROOT/bin; added the `--tojson` and `--hasher` option to _isisdata_mockup_ tool improve utility; updated the tool `README.md` documentation to reflect this change, removed help output and trimmed example results; fixed paths to test data in `make_isisdata_mockup.sh`. [#5163](https://github.com/DOI-USGS/ISIS3/pull/5163) ### Added +- Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183) ### Deprecated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2d86ad6a94fca815361063f3b9adf6c551745177..fb5fe5133173b662ff586bc9121a963f5979131d 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 @@ -58,17 +58,16 @@ requirements: - 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 + - 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 +88,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 +105,6 @@ requirements: - texlive-core - tnt - x264 - - x265 - xalan-c - xerces-c=3 - xorg-kbproto @@ -160,6 +158,7 @@ requirements: - qhull - {{ pin_compatible('qt', max_pin='x.x') }} - {{ pin_compatible('qwt', max_pin='x.x') }} + - rclone - superlu - tnt - x264 @@ -183,4 +182,4 @@ about: home: https://github.com/USGS-Astrogeology/ISIS3 license: CC0-1.0 license_file: LICENSE.md - summary: "Integrated Software for Imagers and Spectrometers" + summary: "Integrated Software for Imagers and Spectrometers" \ No newline at end of file