Skip to content
Snippets Groups Projects
Unverified Commit fa9f3598 authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Version ticks for 8.0 (#5194)

* Version ticks for 8.0 (#5192)

* Fixed typo in ale
parent 3f527ce4
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,7 @@ set(PACKAGE "ISIS") ...@@ -34,7 +34,7 @@ set(PACKAGE "ISIS")
set(PACKAGE_NAME "USGS ISIS") set(PACKAGE_NAME "USGS ISIS")
# Version number # Version number
set(VERSION "7.2.0") set(VERSION "8.0.0")
string(REPLACE "." ";" VERSION_LIST ${VERSION}) string(REPLACE "." ";" VERSION_LIST ${VERSION})
list(GET VERSION_LIST 0 VERSION_MAJOR) list(GET VERSION_LIST 0 VERSION_MAJOR)
list(GET VERSION_LIST 1 VERSION_MINOR) list(GET VERSION_LIST 1 VERSION_MINOR)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# A Public Release for ISIS3.6.1: {% set version = "3.6.1" %} # 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 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" %} # 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 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 # this version, the build number will be 0. It is incremented by 1 with every consecutive build of
...@@ -44,9 +44,7 @@ build: ...@@ -44,9 +44,7 @@ build:
# Shotgun strat on requirements until we can narrow them down # Shotgun strat on requirements until we can narrow them down
requirements: requirements:
build:
- ale=0.8.6 - ale=0.8.6
- aom
- armadillo - armadillo
- boost=1.72 - boost=1.72
- boost-cpp=1.72 - boost-cpp=1.72
...@@ -58,17 +56,16 @@ requirements: ...@@ -58,17 +56,16 @@ requirements:
- cspice=67 - cspice=67
- csm>=3.0.3,<3.0.4 - csm>=3.0.3,<3.0.4
- curl - curl
- cxx-compiler=1.1.2
- doxygen - doxygen
- eigen < 3.4 - 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 - ffmpeg
- geos>=3.7,<3.8 - geos>=3.9,<3.10
- geotiff - geotiff
- gmp - gmp
- graphviz - graphviz
- gsl>=2.6,<2.7 - gsl>=2.6
- hdf5 - hdf5
- icu - icu
- inja - inja
...@@ -89,12 +86,12 @@ requirements: ...@@ -89,12 +86,12 @@ requirements:
- nlohmann_json - nlohmann_json
- ninja==1.7.2 - ninja==1.7.2
- nn - nn
- numpy=1.23
- opencv>=4.5.2 - opencv>=4.5.2
- openssl>=1.1.1k - openssl>=1.1.1k
- pcl >= 1.10.0 - pcl >= 1.10.0
- protobuf<3.20 - protobuf<3.20
- python>=3.7.11 - python>=3.7.11
- pytest
- rclone - rclone
- qhull - qhull
- qt>=5.9.6,<5.15.0 - qt>=5.9.6,<5.15.0
...@@ -106,7 +103,6 @@ requirements: ...@@ -106,7 +103,6 @@ requirements:
- texlive-core - texlive-core
- tnt - tnt
- x264 - x264
- x265
- xalan-c - xalan-c
- xerces-c=3 - xerces-c=3
- xorg-kbproto - xorg-kbproto
...@@ -160,6 +156,7 @@ requirements: ...@@ -160,6 +156,7 @@ requirements:
- qhull - qhull
- {{ pin_compatible('qt', max_pin='x.x') }} - {{ pin_compatible('qt', max_pin='x.x') }}
- {{ pin_compatible('qwt', max_pin='x.x') }} - {{ pin_compatible('qwt', max_pin='x.x') }}
- rclone
- superlu - superlu
- tnt - tnt
- x264 - x264
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment