Commit e7ea41de authored by Kristin's avatar Kristin
Browse files

Merge branch 'dev' of https://github.com/USGS-Astrogeology/ISIS3 into... 

Merge branch 'dev' of https://github.com/USGS-Astrogeology/ISIS3 into initial_virtis_calibrated_camera_model
parents e0aba618 db5bd8e2

.github/pull_request_template.md

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<!--- Provide a general summary of your changes in the Title above -->



## Description

<!--- Describe your changes in detail -->



## Related Issue

<!--- This project only accepts pull requests related to open issues (GitIssues or RedMine Issues at https://fixit.wr.usgs.gov/fixit) -->

<!--- If suggesting a new feature or change, please discuss it in an issue first -->

<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->

<!--- Please link to the issue here: -->



## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->



## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->

<!--- Include details of your testing environment, and the tests you ran to -->

<!--- see how your change affects other areas of the code, etc. -->



## Screenshots (if appropriate):



## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

- [ ] Bug fix (non-breaking change which fixes an issue)

- [ ] New feature (non-breaking change which adds functionality)

- [ ] Documentation change (update to the documentation; no code change)

- [ ] Breaking change (fix or feature that would cause existing functionality to change)



## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->

<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

<!--- - [ ] My code follows the code style of this project. -->

- [ ] I have read and agree to abide by the [Code of Conduct](https://usgs-astrogeology.github.io/code/)

- [ ] I have read the [**CONTRIBUTING**](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/CONTRIBUTING.md) document.

- [ ] My change requires a change to the documentation.

- [ ] I have updated the documentation accordingly.

- [ ] I have added tests to cover my changes.

- [ ] All new and existing tests passed.



## Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:



> This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.



- [ ] I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

.gitignore

+36 −1
Original line number Diff line number Diff line
@@ -42,4 +42,39 @@ print.prt 
*/tsts/*/input/*

*/tsts/*/truth/*

*/tsts/*/output/*

data/
 
*/build/

build/

*/install/



# Created by https://www.gitignore.io/api/macos

# Edit at https://www.gitignore.io/?templates=macos



### macOS ###

# General

.DS_Store

.AppleDouble

.LSOverride



# Icon must end with two \r

Icon



# Thumbnails

._*



# Files that might appear in the root of a volume

.DocumentRevisions-V100

.fseventsd

.Spotlight-V100

.TemporaryItems

.Trashes

.VolumeIcon.icns

.com.apple.timemachine.donotpresent



# Directories potentially created on remote AFP share

.AppleDB

.AppleDesktop

Network Trash Folder

Temporary Items

.apdisk



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

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[submodule "gtest"]

	path = gtest

	url = git@github.com:google/googletest.git

Jenkinsfile

0 → 100644
+145 −0
Original line number Diff line number Diff line 
properties([pipelineTriggers([githubPush()])])



def nodes = [:]



nodes["isis-fedora-25"] = {

    node("isis-fedora-25") {

        withEnv(["ISISROOT=" + "${workspace}" + "/build/", "ISIS3TESTDATA=/usgs/cpkgs/isis3/testData/", "ISIS3DATA=/usgs/cpkgs/isis3/data/"]) {

            stage ("Fedora 25") {

                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build

//                    cmake -GNinja -DJP2KFLAG=OFF -Dpybindings=OFF -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis

//                    set +e

//                    ninja -j8 && ninja install

//                    source /usgs/cpkgs/isis3/isis3mgr_scripts/initIsisCmake.sh .

//                    ctest -V -R _unit_ --timeout 500

//                    ctest -V -R _app_ --timeout 500

//                    ctest -V -R _module_ --timeout 500

//                """

            }

        }

    }

}



nodes["isis-centos-7"] = {

    node("isis-centos-7") {

        withEnv(["ISISROOT=" + "${workspace}" + "/build/", "ISIS3TESTDATA=/usgs/cpkgs/isis3/testData/", "ISIS3DATA=/usgs/cpkgs/isis3/data/"]) {

            stage ("CentOS 7") {

                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build

//                    cmake -GNinja -DJP2KFLAG=OFF -Dpybindings=OFF -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis

//                    set +e

//                    ninja -j8 && ninja install

//                    source /usgs/cpkgs/isis3/isis3mgr_scripts/initIsisCmake.sh .

//                    ctest -V -R _unit_ --timeout 500

//                    ctest -V -R _app_ --timeout 500

//                    ctest -V -R _module_ --timeout 500

//                """

            }

        }

    }

}



nodes["isis-debian-9"] = {

    node("isis-debian-9") {

        withEnv(["ISISROOT=" + "${workspace}" + "/build/", "ISIS3TESTDATA=/usgs/cpkgs/isis3/testData/", "ISIS3DATA=/usgs/cpkgs/isis3/data/"]) {

            stage ("Debian 9") {

                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build

//                    cmake -GNinja -DJP2KFLAG=OFF -Dpybindings=OFF -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis

//                    set +e

//                    ninja -j8 && ninja install

//                    source /usgs/cpkgs/isis3/isis3mgr_scripts/initIsisCmake.sh .

//                    ctest -V -R _unit_ --timeout 500

//                    ctest -V -R _app_ --timeout 500

//                    ctest -V -R _module_ --timeout 500

//                """

            }

        }

    }

}



nodes["isis-ubuntu-1804"] = {

    node("isis-ubuntu-1804") {

        withEnv(["ISISROOT=" + "${workspace}" + "/build/", "ISIS3TESTDATA=/usgs/cpkgs/isis3/testData/", "ISIS3DATA=/usgs/cpkgs/isis3/data/"]) {

            stage ("Ubuntu 18.04") {

                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build

//                    cmake -GNinja -DJP2KFLAG=OFF -Dpybindings=OFF -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis

//                    set +e

//                    ninja -j8 && ninja install

//                    source /usgs/cpkgs/isis3/isis3mgr_scripts/initIsisCmake.sh .

//                    ctest -V -R _unit_ --timeout 500

//                    ctest -V -R _app_ --timeout 500

//                    ctest -V -R _module_ --timeout 500

//                """

            }

        }

    }

}



nodes["mac1013"] = {

    node("mac1013") {

        withEnv(["ISISROOT=" + "${workspace}" + "/build/", "ISIS3TESTDATA=/usgs/cpkgs/isis3/testData/", "ISIS3DATA=/usgs/cpkgs/isis3/data/"]) {

            stage ("MacOS 10.13 (High Sierra)") {

                git branch: 'dev', url: 'https://github.com/USGS-Astrogeology/ISIS3.git'

//                sh """

//                    git clone https://github.com/abseil/googletest.git gtest

//                    conda config --set channel_alias http://astro-bin.wr.usgs.gov/conda

//                    conda config --prepend channels anaconda

//                    conda config --append channels conda-forge

//                    conda config --append channels usgs-astrogeology

//                    conda config --prepend default_channels anaconda

//                    conda env create -n isis3 -f environment.yml

//                    source activate isis3

//                    mkdir -p ./install ./build && cd build

//                    cmake -GNinja -DJP2KFLAG=OFF -Dpybindings=OFF -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis

//                    set +e

//                    ninja -j8 && ninja install

//                    source /usgs/cpkgs/isis3/isis3mgr_scripts/initIsisCmake.sh .

//                    ctest -V -R _unit_ --timeout 500

//                    ctest -V -R _app_ --timeout 500

//                    ctest -V -R _module_ --timeout 500

//                """

            }

        }

    }

}



parallel nodes

LICENSE.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
This is free and unencumbered software released into the public domain.



Anyone is free to copy, modify, publish, use, compile, sell, or

distribute this software, either in source code form or as a compiled

binary, for any purpose, commercial or non-commercial, and by any

means.



In jurisdictions that recognize copyright laws, the author or authors

of this software dedicate any and all copyright interest in the

software to the public domain. We make this dedication for the benefit

of the public at large and to the detriment of our heirs and

successors. We intend this dedication to be an overt act of

relinquishment in perpetuity of all present and future rights to this

software under copyright law.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR

OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

OTHER DEALINGS IN THE SOFTWARE.



For more information, please refer to <http://unlicense.org/>