Unverified Commit e73a870b authored by AustinSanders's avatar AustinSanders Committed by GitHub
Browse files

Version ticks + meta.yaml changes for 5.0.0_RC1 (#4386) 

* add pin_compatible for jasper and xerces

* added jasper to host deps

* Added missing packages

* Added geotiff to run deps

* Added missing packages

* Added pin_compatibility style versioning

* Pinned geotiff

* Prep for 5.0.0RC1

* Fixed version tick

* Fixed ordering of packages
parent 6b7fff4d

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ release. 


## [Unreleased]



## [5.0.0] - 2021-04-01



### Added

- The following calibration applications were updated to not require local mission-specific SPICE kernels when working with spiceinited cubes: amicacal, ctxcal, lrowaccal, moccal, mdiscal, hical, hicalbeta, vikcal, and gllssical. This makes it possible to first run spiceinit using the spice server and then run these calibration applications without ever needing to download mission-specific kernels. If spiceinit has not been run on the input cube, these apps will still require the kernels area to run. [#4303](https://github.com/USGS-Astrogeology/ISIS3/issues/4303)

isis/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${VERSION}") 


# Other release information

string(TIMESTAMP VERSION_DATE "%Y-%m-%d" UTC)

set(RELEASE_STAGE             "stable") # (alpha, beta, stable)

set(RELEASE_STAGE             "beta") # (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")

recipe/meta.yaml

+36 −22
Original line number Diff line number Diff line
@@ -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 = "5.0.0" %}

{% set version = "5.0.0_RC" %}



# 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
@@ -45,39 +45,48 @@ build: 
# Shotgun strat on requirements until we can narrow them down

requirements:

  build:

    - boost=1.68.0

    - cmake >=3.15

    - doxygen

    - inja

    - make

    - ninja==1.7.2

    - openssl>=1.0.0,<1.1.0

    - protobuf=3.9.1

    - xalan-c



  host:

  - armadillo

  - ale >=0.8.5

  - armadillo >=9.200.4

  - boost=1.68.0

  - blas

  - bullet=2.86.1=0

  - bz2file

  - bzip2

  - cmake >=3.15

  - csm

  - cspice

  - curl

  - doxygen

  - eigen

  - embree

  - geos>=3.7,<3.8

  - geotiff

  - gmm

  - gmp

  - gsl>=2.6

  - hdf5

  - icu

  - inja

  - jama

  - jpeg==9b

  - kakadu==1

  - krb5

  - libpng>=1.6.34

  - libprotobuf=3.9.1

  - libtiff

  - libxml2

  - make

  - mesalib

  - mysql

  - mysql-connector-c

  - nanoflann

  - ninja==1.7.2

  - nlohmann_json

  - nn

  - opencv=3.2
@@ -92,7 +101,7 @@ requirements: 
  - superlu

  - tnt

  - x264=20131218

  - xerces-c=3.1.4

  - xerces-c

  - xorg-kbproto

  - xorg-libice

  - xorg-libsm
@@ -101,40 +110,45 @@ requirements: 
  - zlib



  run:

  - ale >=0.8.5

  - armadillo >=9.200.4

  - boost=1.68.0

  - {{ pin_compatible('ale') }}

  - {{ pin_compatible('boost', max_pin='x.x') }}

  - blas

  - bullet=2.86.1=0

  - {{ pin_compatible('bullet', max_pin='x.x') }}

  - bz2file

  - csm

  - cspice

  - curl

  - eigen

  - embree

  - geos>=3.7,<3.8

  - {{ pin_compatible('geos', min_pin='x.x', max_pin='x.x') }}

  - {{ pin_compatible('geotiff', max_pin='x.x') }}

  - geotiff

  - gsl>=2.6

  - gmm

  - {{ pin_compatible('gsl', min_pin='x.x') }}

  - hdf5

  - icu

  - inja

  - jama

  - jpeg==9b

  - kakadu==1

  - libpng>=1.6.34

  - {{ pin_compatible('jasper', max_pin='x.x') }}

  - {{ pin_compatible('jpeg', max_pin='x') }}

  - {{ pin_compatible('kakadu', max_pin='x') }}

  - {{ pin_compatible('libpng') }}

  - mesalib

  - mysql

  - nanoflann

  - nlohmann_json

  - nn

  - opencv=3.2

  - {{ pin_compatible('opencv', max_pin='x.x') }}

  - {{ pin_compatible('openssl', min_pin='x', max_pin='x.x') }}

  - pcl

  - protobuf=3.9.1

  - {{ pin_compatible('protobuf', max_pin='x.x') }}

  - qhull

  - qt=5.9.6

  - qwt=6.1.3

  - {{ pin_compatible('qt', max_pin='x.x') }}

  - {{ pin_compatible('qwt', max_pin='x.x') }}

  - superlu

  - tnt

  - x264=20131218

  - xerces-c=3.1.4

  - {{ pin_compatible('xerces-c', max_pin='x.x.x') }}

  - xorg-kbproto

  - xorg-libice

  - xorg-libsm