From d2b0ddf59f7598a94742df82434ac08d78307dc7 Mon Sep 17 00:00:00 2001 From: monty Date: Sat, 29 Jun 2019 10:02:19 -0600 Subject: [PATCH] COPYING.md fix --- .travis.yml | 7 ++----- COPYING | 27 --------------------------- COPYING.md | 14 ++++++++++++++ Project.toml | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 32 deletions(-) delete mode 100644 COPYING create mode 100644 COPYING.md create mode 100644 Project.toml diff --git a/.travis.yml b/.travis.yml index 92d36f1..8f53262 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,8 @@ os: - osx - linux julia: - - 0.7 + - 1.1 notifications: email: false -# script: -# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi -# - julia -e 'Pkg.clone(pwd()); Pkg.build("RobustPmap"); Pkg.test("RobustPmap"; coverage=true)'; after_success: - - julia -e 'cd(Pkg.dir("RobustPmap")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Codecov.process_folder())' \ No newline at end of file + - julia -e 'import Pkg; import RobustPmap; cd(joinpath(dirname(pathof(RobustPmap)))); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Codecov.process_folder())' \ No newline at end of file diff --git a/COPYING b/COPYING deleted file mode 100644 index f92bfc2..0000000 --- a/COPYING +++ /dev/null @@ -1,27 +0,0 @@ -MADS: Model Analysis & Decision Support in Julia (Mads.jl v1.0) 2016 - -http://mads.lanl.gov -http://madsjulia.lanl.gov -http://gitlab.com/mads/Mads.jl - -Licensing: GPLv3: http://www.gnu.org/licenses/gpl-3.0.html - -Copyright 2016. Los Alamos National Security, LLC. All rights reserved. - -This material was produced under U.S. Government contract DE-AC52-06NA25396 for -Los Alamos National Laboratory, which is operated by Los Alamos National Security, LLC for -the U.S. Department of Energy. The Government is granted for itself and others acting on its -behalf a paid-up, nonexclusive, irrevocable worldwide license in this material to reproduce, -prepare derivative works, and perform publicly and display publicly. Beginning five (5) years after ---------------- November 17, 2015, ---------------------------------------------------------------- -subject to additional five-year worldwide renewals, the Government is granted for itself and -others acting on its behalf a paid-up, nonexclusive, irrevocable worldwide license in this -material to reproduce, prepare derivative works, distribute copies to the public, perform -publicly and display publicly, and to permit others to do so. - -NEITHER THE UNITED STATES NOR THE UNITED STATES DEPARTMENT OF ENERGY, NOR LOS ALAMOS NATIONAL SECURITY, LLC, -NOR ANY OF THEIR EMPLOYEES, MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LEGAL LIABILITY OR -RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF ANY INFORMATION, APPARATUS, PRODUCT, OR -PROCESS DISCLOSED, OR REPRESENTS THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS. - -LA-CC-15-080; Copyright Number Assigned: C16008 diff --git a/COPYING.md b/COPYING.md new file mode 100644 index 0000000..7cccd3f --- /dev/null +++ b/COPYING.md @@ -0,0 +1,14 @@ +MADS: Model Analysis & Decision Support in Julia (Mads.jl v1.0) 2016 +--------------- + +Licensing: GPLv3: http://www.gnu.org/licenses/gpl-3.0.html + +© (or copyright) 2019. Triad National Security, LLC. All rights reserved. + +This program was produced under U.S. Government contract 89233218CNA000001 for Los Alamos National Laboratory (LANL), which is operated by Triad National Security, LLC for the U.S. Department of Energy/National Nuclear Security Administration. + +All rights in the program are reserved by Triad National Security, LLC, and the U.S. Department of Energy/National Nuclear Security Administration. The Government is granted for itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license in this material to reproduce, prepare derivative works, distribute copies to the public, perform publicly and display publicly, and to permit others to do so. + +This is open source software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Full text of the GPLv3License can be found in the License file in the main development branch of the repository and at http://www.gnu.org/licenses/gpl-3.0.html. + +LA-CC-15-080; Copyright Number Assigned: C16008 diff --git a/Project.toml b/Project.toml new file mode 100644 index 0000000..9e3abb4 --- /dev/null +++ b/Project.toml @@ -0,0 +1,20 @@ +name = "RobustPmap" +uuid = "27aeedcb-f738-516b-a0b8-3211cf1146e5" +version = "0.5.0" + +[deps] +Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" +Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" +FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" +JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" + +[compat] +Compat = "≥ 0.7.15" +julia = "≥ 1.1.0" + +[extras] +Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["Test", "Distributed"]