From 84b3f885cea2547a63315d4225715995e642f36e Mon Sep 17 00:00:00 2001 From: Luke Pratley Date: Fri, 1 Feb 2019 17:54:41 +0000 Subject: [PATCH 1/7] Add DOI Badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 853e3a6dd..4ae7cbdeb 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ Sparse OPTimisation Library [![Build Status](https://travis-ci.com/astro-informatics/sopt.svg?branch=development)](https://travis-ci.com/astro-informatics/sopt) [![codecov](https://codecov.io/gh/astro-informatics/sopt/branch/development/graph/badge.svg)](https://codecov.io/gh/astro-informatics/sopt) +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2555235.svg)](https://doi.org/10.5281/zenodo.2555235) Description ------------- From 2696b36055849d33b57f9bc695c817f16082899f Mon Sep 17 00:00:00 2001 From: Luke Pratley Date: Mon, 25 Feb 2019 14:07:21 +0000 Subject: [PATCH 2/7] updated verison of sopt in CMake --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1d057d4a..84ee106f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ include(LookUp-GreatCMakeCookOff) # Version and git hash id include(VersionAndGitRef) -set_version(2.0.0) +set_version(3.0.0) get_gitref() option(tests "Enable testing" on) From bb1da825a317dfc56066b7fd6e47dee5c0fe1fb0 Mon Sep 17 00:00:00 2001 From: Luke Pratley Date: Mon, 25 Feb 2019 14:33:25 +0000 Subject: [PATCH 3/7] changed author order in DOI and version to 3.0.1 --- .zenodo.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 032c33ab3..aecbaf2ed 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,13 +1,18 @@ { - "publication_date": "2019-02-01", + "publication_date": "2019-02-25", "title": "SOPT", - "version": "3.0.0", + "version": "3.0.1", "creators": [ { "affiliation": "University College London", "name": "Luke Pratley", "orcid": "0000-0002-4716-9933" }, + { + "affiliation": "University College London", + "name": "Jason D. McEwen", + "orcid": "0000-0002-5852-8890" + }, { "affiliation": "Imperial College", "name": "Mayeul d'Avezac", @@ -26,11 +31,6 @@ "name": "Roland Guichard", "orcid": "0000-0003-3969-4102" }, - { - "affiliation": "University College London", - "name": "Jason D. McEwen", - "orcid": "0000-0002-5852-8890" - }, { "affiliation": "University College London", "name": "David Pérez-Suárez", From cfbb281f7464858980bb49801e8cafcbc26e5409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A9rez-Su=C3=A1rez?= Date: Tue, 26 Feb 2019 09:22:35 +0000 Subject: [PATCH 4/7] Update DOI on readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ae7cbdeb..96b30343d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Sparse OPTimisation Library [![Build Status](https://travis-ci.com/astro-informatics/sopt.svg?branch=development)](https://travis-ci.com/astro-informatics/sopt) [![codecov](https://codecov.io/gh/astro-informatics/sopt/branch/development/graph/badge.svg)](https://codecov.io/gh/astro-informatics/sopt) -[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2555235.svg)](https://doi.org/10.5281/zenodo.2555235) +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2555234.svg)](https://doi.org/10.5281/zenodo.2555234) Description ------------- From 4b553deb665731c80d3980671d9d6df5d50bd78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A9rez-Su=C3=A1rez?= Date: Tue, 26 Feb 2019 09:23:36 +0000 Subject: [PATCH 5/7] Adds Ilektra's ORCID --- .zenodo.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.zenodo.json b/.zenodo.json index aecbaf2ed..f9f39a45e 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -24,7 +24,8 @@ }, { "affiliation": "University College London", - "name": "Ilektra Christidi" + "name": "Ilektra Christidi", + "orcid": "0000-0002-5045-7987" }, { "affiliation": "University College London", From 3a26398789a62d5f2c1634af9e8251c56a730c21 Mon Sep 17 00:00:00 2001 From: Luke Pratley Date: Tue, 26 Feb 2019 13:51:21 +0000 Subject: [PATCH 6/7] updated version in library to 3.0.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84ee106f2..7ed964103 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ include(LookUp-GreatCMakeCookOff) # Version and git hash id include(VersionAndGitRef) -set_version(3.0.0) +set_version(3.0.1) get_gitref() option(tests "Enable testing" on) From 09004be3f4aa9c8d8ca7e66c2a5e82855ac10db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A9rez-Su=C3=A1rez?= Date: Mon, 4 Mar 2019 18:27:17 +0000 Subject: [PATCH 7/7] [ci] adds ci-helpers to maintain this better --- .ci/install_spack.sh | 24 ------------------------ .ci/spack_env.sh | 5 ----- .travis.yml | 14 ++++++++++---- 3 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 .ci/install_spack.sh delete mode 100644 .ci/spack_env.sh diff --git a/.ci/install_spack.sh b/.ci/install_spack.sh deleted file mode 100644 index 2559dbfb5..000000000 --- a/.ci/install_spack.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -xe - -cwd=$(pwd) -cd $HOME - -# Are we using the cache directory or it's empty? -if [ ! -f $HOME/spack/README.md ] -then - rm -rf spack - git clone https://github.com/spack/spack.git -fi - -. spack/share/spack/setup-env.sh - - -while sleep 540 ; do echo "=========== make is taking more than 9m - pinging travis =========="; done & -spack compiler list -spack compiler remove clang@10.0.0-apple -spack compiler list -# spack install -y gcc@7.2.0 -# spack compiler add `spack location -i gcc@7.2.0` -spack install -y openmpi@3.0.0 - -cd $cwd diff --git a/.ci/spack_env.sh b/.ci/spack_env.sh deleted file mode 100644 index af7ae2282..000000000 --- a/.ci/spack_env.sh +++ /dev/null @@ -1,5 +0,0 @@ - -export SPACK_ROOT=$HOME/spack -. $SPACK_ROOT/share/spack/setup-env.sh - -spack load openmpi@3.0.0 diff --git a/.travis.yml b/.travis.yml index 0db451b59..70bb3e55d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,7 @@ matrix: - openMP=ON - DOCS=OFF - MPI_PROCS=2 + - CI_HELPERS='spack' addons: homebrew: packages: @@ -261,15 +262,20 @@ before_install: - if [ $TRAVIS_OS_NAME = linux ]; then ClangVer="-5.0"; fi - if [[ ${TITLE} = *GCC* ]]; then CC=gcc-7; else CC=clang${ClangVer}; fi - if [[ ${TITLE} = *GCC* ]]; then CXX=g++-7; else CXX=clang++${ClangVer}; fi - - if [ $TRAVIS_OS_NAME = osx ] && [[ $MPI = ON ]]; then bash .ci/install_spack.sh; source $(brew --prefix modules)/init/bash; source .ci/spack_env.sh ;fi - # As MPI is not installed already, this variable is not set properly; this - # way is set up for all the jobs in the same manner. - - if [[ $MPI = ON ]]; then eval $MPI_CONFIG; fi - echo "==================== ${TITLE} =====================" - if [[ ${TITLE} = *Documentation* ]]; then docker pull uclrits/sopt; fi install: + # Add CI-helpers and install the dependencies we need from them. + - | + if [ ! -z ${CI_HELPERS} ]; then + git clone --depth 1 git://github.com/UCL-RITS/ci-helpers.git + source ci-helpers/travis/setup.sh ${CI_HELPERS} + fi + # As MPI is not installed already, this variable is not set properly; this + # way is set up for all the jobs in the same manner. + - if [[ $MPI = ON ]]; then eval $MPI_CONFIG; echo $CMAKE_CMD_EXTRA; fi before_script: - |