Merge pull request #240 from astro-informatics/development

3.0.1 release - updating versioning

.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:
   - |

.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",
@@ -19,18 +24,14 @@
 	      },
 	      {
 	          "affiliation": "University College London",
-	          "name": "Ilektra Christidi"
+	          "name": "Ilektra Christidi",
+            "orcid": "0000-0002-5045-7987"
 	      },
 	      {
 	          "affiliation": "University College London",
 	          "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",

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.1)
 get_gitref()
 
 option(tests          "Enable testing"                         on)

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.2555234.svg)](https://doi.org/10.5281/zenodo.2555234)
 
 Description
 -------------