Unverified Commit 4aaa4d64 authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Requiring python 3.7.11 or newer (#4634) 



* naive first steps to requiring python 3.7.11 or newer

* missed a patch version

* bumping x264 to 20180712, 5 years newer

* added idea folder to gitignore

* found that tnt, gmm, jama not on conda forge

* updating opencv to a release from 2018

* Update meta.yaml

opencv 3.4.7 has builds for python 3.6-3.8 and multiple blas versions

* Update environment.yml

opencv at first glance seems to be the most restricting library as it depends on blas, numpy, jpeg, jasper, python.   3.4.7 should support newer python version

* worked out that meta.yaml is more important, boost is the other hard bin of concern

* made more conda-forge channel prefs

* Update env and CMake files

* Update opencv dependent files

* Updated findfeatures test

* Renamed variable conflicting with other sync global

* Added includes for qwt_text to necessary files

* Updated gcc4 env

* Reverted some gcc4 requirements

* Addressed tiff deprication warnings

* Addressed protobuf deprications

* Fixed compile problems

* Removed tointsize calls

* Reverted gcc4 environment file

* Updated recipe based on new environment.yml

* Updated pds4 to remove error output

* Final environment.yml

* Fixed xml seed issue in cnetedit

* working meta.yml

* pinned ale

* removed SURF param, reverted meta.yml repo

* version tick

* Resolved changelog conflict

* Updated environment test

Co-authored-by: default avatarAndrew Annex <andrew.annex@gmail.com>
Co-authored-by: default avatarAndrew Annex <ama6fy@virginia.edu>
Co-authored-by: default avatarKelvin Rodriguez <krodriguez@usgs.gov>
parent 73e3db57

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -87,3 +87,4 @@ Temporary Items 
.apdisk



# End of https://www.gitignore.io/api/macos

.idea

CHANGELOG.md

+4 −2
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ release. 


## [Unreleased]



### Fixed

- Fixed a bug where the measure residuals reported in the bundleout.txt file were incorrect. [#4655](https://github.com/USGS-Astrogeology/ISIS3/issues/4655)

### Changed

- Disabled SURF algorithm for findfeatures, latest version of opencv no longer provides SURF as part of the base library [#3885](https://github.com/USGS-Astrogeology/ISIS3/issues/3885)





### Added

- Added the USECAMSTATSTBL option to caminfo. This allows caminfo to extract existing
@@ -52,6 +53,7 @@ Keywords when running CAMSTATS. [#3605](https://github.com/USGS-Astrogeology/IS 


### Fixed

- Fixed the Vesta target name not being translated properly in dawnfc2isis. [#4638](https://github.com/USGS-Astrogeology/ISIS3/issues/4638)

- Fixed a bug where the measure residuals reported in the bundleout.txt file were incorrect. [#4655](https://github.com/USGS-Astrogeology/ISIS3/issues/4655)



## [6.0.0] - 2021-08-27

code.json

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    "name": "ISIS3",

    "organization": "U.S. Geological Survey",

    "description": "GitHub code repository for the Integrated Software for Imagers and Spectrometers (ISIS)",

    "version": "6.0.0",

    "version": "7.0.0",

    "status": "Release",



    "permissions": {

environment.yml

+21 −18
Original line number Diff line number Diff line 
channels:

  - usgs-astrogeology

  - conda-forge

  - defaults



dependencies:

  - ale >=0.8.5

  - boost=1.68.0

  - ale=0.8.6

  - armadillo

  - boost=1.72

  - boost-cpp=1.72

  - blas

  - bullet=2.86.1=0

  - usgs-astrogeology::bullet

  - bz2file

  - bzip2

  - cmake >=3.15
@@ -16,9 +16,9 @@ dependencies: 
  - csm>=3.0.3,<3.0.4

  - curl

  - doxygen

  - eigen

  - eigen < 3.4

  - embree

  - ffmpeg>=3.4.1

  - ffmpeg

  - geos>=3.7,<3.8

  - geotiff

  - gmp
@@ -28,12 +28,13 @@ dependencies: 
  - icu

  - inja

  - jama

  - jpeg==9b

  - kakadu==1

  - jpeg

  - usgs-astrogeology::kakadu==1

  - krb5

  - libopencv>=4.5.2

  - libpng>=1.6.34

  - libprotobuf=3.9.1

  - libtiff

  - libprotobuf

  - libtiff>=4.0

  - libxml2

  - make

  - mesalib
@@ -43,20 +44,22 @@ dependencies: 
  - nlohmann_json

  - ninja==1.7.2

  - nn

  - opencv=3.2

  - openssl>=1.0.0,<1.1.0

  - pcl

  - protobuf=3.9.1

  - opencv>=4.5.2

  - openssl>=1.1.1k

  - pcl >= 1.10.0

  - protobuf

  - python>=3.7.11

  - qhull

  - qt=5.9.6

  - qwt=6.1.3

  - qt>=5.9.6

  - qwt

  - sqlite

  - suitesparse

  - superlu

  - swig

  - tnt

  - x264=20131218

  - x264

  - xalan-c

  - xerces-c

  - xerces-c=3

  - xorg-kbproto

  - xorg-libice

  - xorg-libsm

isis/CMakeLists.txt

+7 −6
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ set(PACKAGE "ISIS") 
set(PACKAGE_NAME       "USGS ISIS")



# Version number

set(VERSION            "6.0.0")

set(VERSION            "7.0.0")

string(REPLACE "." ";" VERSION_LIST ${VERSION})

list(GET VERSION_LIST 0 VERSION_MAJOR)

list(GET VERSION_LIST 1 VERSION_MINOR)
@@ -162,7 +162,7 @@ include(CTest) 
# sometimes third parties do not set their rpaths correctly

set(thirdPartyCppFlags -Wall

                       -fPIC

                       -std=c++11

                       -std=c++14

                       -DISIS_LITTLE_ENDIAN=1

                       -Wno-unused-parameter

                       -Wno-overloaded-virtual
@@ -172,6 +172,8 @@ set(thirdPartyCppFlags -Wall 
                       -DENABLEJP2K=${JP2KFLAG}

                     )



set(CMAKE_CXX_STANDARD 14)



# Append CPP flags set in the third party lib file to the string set in this file.

string(REPLACE ";" " " FLAGS_STR "${thirdPartyCppFlags}")
@@ -240,7 +242,6 @@ find_package(Boost 1.59.0 REQUIRED atomic 
                                        serialization

                                        chrono

                                        math_c99

                                        signals

                                        container

                                        math_c99f

                                        context