Release (#665)

* Updated version for 3.6.1 release * Modified to have cubeit remove mosaic pixel tracking info from labels. Fixes #5533 * Update cubeit.xml Fixed a typo * Moved ISIS3 conda-build recipe from ISIS3_deps repository (#650) * Merged updated environemnt
DOI-USGS · Dec 19, 2018 · 793b246 · 793b246
1 parent f3e5e4b
commit 793b246
Show file tree

Hide file tree

Showing 7 changed files with 268 additions and 36 deletions.
diff --git a/environment.yml b/environment.yml
@@ -6,65 +6,62 @@ channels:
 
 dependencies:
   - armadillo==8.200.0
-  - blas==1.1=openblas
-  - bullet==2.86.1=0
+  - blas==1.1
+  - bullet==2.86.1
   - bz2file==0.98
-  - bzip2==1.0.6=1
-  - cmake==3.9.1=0
-  - cspice==66=h470a237_3
-  - curl==7.60.0=0
-  - doxygen==1.8.14=0
-  - eigen==3.3.3=0
-  - embree==2.14.0=0
+  - bzip2==1.0.6
+  - cmake>=3.10
+  - cspice==66
+  - curl==7.60.0
+  - doxygen==1.8.14
+  - eigen==3.3.3
+  - embree==2.14.0
   - geos==3.5.1
-  - geotiff==1.4.2=1
+  - geotiff==1.4.2
   - gmm==5.0
-  - gmp==6.1.2=0
-  - gsl==2.2.1=blas_openblas_3
-  - hdf5==1.8.18=2
-  - icu==58.2=0
+  - gmp==6.1.2
+  - gsl==2.2.1
+  - hdf5==1.8.18
+  - icu==58.2
   - jama==125
-  - jpeg==9b=2
+  - jpeg==9b
   - kakadu==1
-  - krb5==1.14.2=0
+  - krb5==1.14.2
   - libpng>=1.6.34
   - libprotobuf==3.5.2
-  - libtiff==4.0.9=0
-  - libxml2==2.9.7=0
+  - libtiff>=4.0.9
+  - libxml2==2.9.7
   - make
-  - mesalib==17.2.0=0
+  - mesalib==17.2.0
   - mysql==5.7.20
-  - mysql-connector-c==6.1.6=0
+  - mysql-connector-c==6.1.6
   - nanoflann==1.2.2
-  - ninja==1.7.2=0
+  - ninja==1.7.2
   - conda-forge/label/gcc7::nn
-  # - numpy==1.13.3=py36_blas_openblas_200
-  - openblas==0.2.19=2
+  - openblas==0.2.19
   - opencv
-  - openssl==1.0.2n=0
+  - openssl==1.0.2n
   - patchelf==0.9
   - pcl==1.8.1
   - pip==9.0.1
   - protobuf==3.5.2
-  # - pyqt==5.6.0
   - python==3.6
   - qhull==7.2.0=0
   - qt=5.9.6
   - qwt=6.1.3
   - setuptools=38.5.1
   - sip==4.18
-  - sqlite==3.13.0=1
-  - suitesparse==4.5.4=blas_openblas_200
-  - superlu==5.2.1=blas_openblas_201
+  - sqlite==3.13.0
+  - suitesparse==4.5.4
+  - superlu==5.2.1
   - tnt==126=0
   - wheel==0.30.0
   - x264==20131218
   - xalan-c==1.11
-  - xerces-c==3.1.4=0
-  - xorg-kbproto==1.0.7=1
+  - xerces-c==3.1.4
+  - xorg-kbproto==1.0.7
   - xorg-libice
   - xorg-libsm
-  - xorg-libx11==1.6.4=6
+  - xorg-libx11==1.6.4
   - xorg-libxi
-  - zlib==1.2.11=0
-
+  - zlib==1.2.11
diff --git a/environment_gcc4.yml b/environment_gcc4.yml
@@ -0,0 +1,68 @@
+channels:
+  - jessemapel
+  - usgs-astrogeology
+  - conda-forge
+  - probcomp
+  - defaults
+
+dependencies:
+  - armadillo==8.200.0
+  - blas==1.1=openblas
+  - bullet==2.86.1
+  - bz2file==0.98
+  - bzip2==1.0.6
+  - cmake>=3.10
+  - cspice==66
+  - curl==7.60.0
+  - doxygen==1.8.14
+  - eigen==3.3.3
+  - embree==2.14.0
+  - geos==3.5.1
+  - geotiff==1.4.2
+  - gmm==5.0
+  - gmp==6.1.2
+  - gsl==2.2.1
+  - hdf5==1.8.18
+  - icu==58.2
+  - jama==125
+  - jpeg==9b
+  - kakadu==1
+  - krb5==1.14.2
+  - libpng>=1.6.34
+  - libprotobuf==3.5.2
+  - libtiff>=4.0.9
+  - libxml2==2.9.7
+  - make
+  - mesalib==17.2.0
+  - mysql==5.7.20
+  - mysql-connector-c==6.1.6
+  - nanoflann==1.2.2
+  - ninja==1.7.2
+  - nn==1.86.0
+  - openblas==0.2.19
+  - opencv
+  - openssl==1.0.2n
+  - patchelf==0.9
+  - pcl==1.8.1
+  - pip==9.0.1
+  - protobuf==3.5.2
+  - python==3.6
+  - qhull==7.2.0=0
+  - qt=5.9.6
+  - qwt=6.1.3
+  - setuptools=38.5.1
+  - sip==4.18
+  - sqlite==3.13.0
+  - suitesparse==4.5.4
+  - superlu==5.2.1
+  - tnt==126=0
+  - wheel==0.30.0
+  - x264==20131218
+  - xalan-c==1.11
+  - xerces-c==3.1.4
+  - xorg-kbproto==1.0.7
+  - xorg-libice
+  - xorg-libsm
+  - xorg-libx11==1.6.4
+  - xorg-libxi
+  - zlib==1.2.11
diff --git a/isis/src/base/apps/cubeit/cubeit.cpp b/isis/src/base/apps/cubeit/cubeit.cpp
@@ -183,6 +183,13 @@ void IsisMain() {
     ocube->deleteBlob("Table", "InputImages");
   }
 
+  // Delete the Tracking group if it exists (3.6.0 and up)
+  // The tracking group could be transfered from the first input cube, but it does not
+  // represent the images used in any other band after cubeit.
+  if(ocube->hasGroup("Tracking")) {
+    ocube->deleteGroup("Tracking");
+  }
+
   p2.EndProcess();
 
  // Now loop and mosaic in each cube

diff --git a/isis/src/base/apps/cubeit/cubeit.xml b/isis/src/base/apps/cubeit/cubeit.xml
@@ -79,6 +79,9 @@
        Modified Makefile of badinputs app test to truncate paths before data directory. Allows tests
        to pass when not using the default data area. Fixes #4783.
      </change>
+     <change name="Stuart Sides" date="2018-11-19">
+       Removed the tracking label group if it exists in the output cube. Fixes #5533.
+     </change>
      </history>
 
   <groups>

diff --git a/isis/version b/isis/version
@@ -1,3 +1,3 @@
-3.6.0        # Public version number
-10-26-2018   # Release date
-stable         # release stage (alpha, beta, stable)
+3.6.1        # Public version number
+12-19-2018   # Release date
+stable       # release stage (alpha, beta, stable)
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -0,0 +1,5 @@
+mkdir build
+cd build
+cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis
+ninja install
+ninja docs
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -0,0 +1,152 @@
+{% set version = "3.6.1" %}
+{% set git_branch = "release" %}
+{% set build_number = "0" %}
+
+package:
+  name: isis3
+  version: {{ version }}
+
+source:
+  git_url: 'https://github.com/USGS-Astrogeology/ISIS3.git'
+  git_branch: {{ git_branch }}
+
+build:
+  number: {{ build_number }}
+
+# Shotgun strat on requirements until we can narrow them down
+requirements:
+  build:
+  - armadillo==8.200.0
+  - blas==1.1
+  - bullet==2.86.1
+  - bz2file==0.98
+  - bzip2==1.0.6
+  - cmake=>3.10
+  - cspice==66
+  - curl==7.60.0
+  - doxygen==1.8.14
+  - eigen==3.3.3
+  - embree==2.14.0
+  - geos==3.5.1
+  - geotiff==1.4.2
+  - gmm==5.0
+  - gmp==6.1.2
+  - gsl==2.2.1
+  - hdf5==1.8.18
+  - icu==58.2
+  - jama==125
+  - jpeg==9b
+  - kakadu==1
+  - krb5==1.14.2
+  - libpng>=1.6.34
+  - libprotobuf==3.5.2
+  - libtiff=>4.0.9
+  - libxml2==2.9.7
+  - make
+  - mesalib==17.2.0
+  - mysql==5.7.20
+  - mysql-connector-c==6.1.6
+  - nanoflann==1.2.2
+  - ninja==1.7.2
+  - nn
+  - openblas==0.2.19
+  - opencv==3.2.0|3.3.0
+  - openssl==1.0.2n
+  - patchelf==0.9
+  - pcl==1.8.1
+  - pip==9.0.1
+  - protobuf==3.5.2
+  - python==3.6
+  - qhull==7.2.0=0
+  - qt=5.9.6
+  - qwt=6.1.3
+  - setuptools=38.5.1
+  - sip==4.18
+  - sqlite==3.13.0
+  - suitesparse==4.5.4
+  - superlu==5.2.1
+  - tnt==126=0
+  - wheel==0.30.0
+  - x264==20131218
+  - xalan-c==1.11
+  - xerces-c==3.1.4
+  - xorg-kbproto==1.0.7
+  - xorg-libice
+  - xorg-libsm
+  - xorg-libx11==1.6.4
+  - xorg-libxi
+  - zlib==1.2.11
+  run:
+  - armadillo==8.200.0
+  - blas==1.1
+  - bullet==2.86.1
+  - bz2file==0.98
+  - bzip2==1.0.6
+  - cmake==3.9.1
+  - cspice==66
+  - curl==7.60.0
+  - doxygen==1.8.14
+  - eigen==3.3.3
+  - embree==2.14.0
+  - geos==3.5.1
+  - geotiff==1.4.2
+  - gmm==5.0
+  - gmp==6.1.2
+  - gsl==2.2.1
+  - hdf5==1.8.18
+  - icu==58.2
+  - jama==125
+  - jasper=1
+  - jpeg==9b
+  - kakadu==1
+  - krb5==1.14.2
+  - libpng>=1.6.34
+  - libprotobuf==3.5.2
+  - libtiff=>4.0.9
+  - libxml2==2.9.7
+  - make
+  - mesalib==17.2.0
+  - mysql==5.7.20
+  - mysql-connector-c==6.1.6
+  - nanoflann==1.2.2
+  - ninja==1.7.2
+  - conda-forge/label/gcc7::nn
+  - openblas==0.2.19
+  - opencv==3.2.0|3.3.0
+  - openssl==1.0.2n
+  - patchelf==0.9
+  - pcl==1.8.1
+  - pip==9.0.1
+  - protobuf==3.5.2
+  - python==3.6
+  - qhull==7.2.0=0
+  - qt=5.9.6
+  - qwt=6.1.3
+  - setuptools=38.5.1
+  - sip==4.18
+  - sqlite==3.13.0
+  - suitesparse==4.5.4
+  - superlu==5.2.1
+  - tnt==126=0
+  - wheel==0.30.0
+  - x264==20131218
+  - xalan-c==1.11
+  - xerces-c==3.1.4
+  - xorg-kbproto==1.0.7
+  - xorg-libice
+  - xorg-libsm
+  - xorg-libx11==1.6.4
+  - xorg-libxi
+  - zlib==1.2.11
+# Add the tests eventually
+# test:
+#
+
+# about:
+#   home: https://developers.google.com/protocol-buffers/
+#   license: BSD 3-Clause
+#   license_file: LICENSE
+#   summary: "Protocol Buffers - Google's data interchange format."
+
+# extra:
+#   recipe-maintainers: