From 002e1377e877376c7ecd0912e2f943b107853554 Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 15:47:05 +1000 Subject: [PATCH 01/10] Attempting to fix travis build failure --- .travis.yml | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6e9ead9..f04f6667 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,13 @@ env: - DOCTEST=true - CORRFUNC_CI=true -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gcc-4.8 - - libgsl0-dev +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - gcc-6.4 +# - libgsl0-dev matrix: fast_finish: true @@ -82,7 +82,23 @@ matrix: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh - os: linux - dist: trusty + dist: xenial + sudo: required + compiler: gcc + env: COMPILER=gcc PYTHON_VERSION=2.7 + before_install: + - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh + + - os: linux + dist: xenial + sudo: required + compiler: gcc + env: COMPILER=gcc PYTHON_VERSION=3.5 + before_install: + - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh + + - os: linux + dist: xenial sudo: required compiler: gcc env: COMPILER=gcc PYTHON_VERSION=3.6 @@ -90,7 +106,7 @@ matrix: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh - os: linux - dist: trusty + dist: xenial sudo: required compiler: gcc env: COMPILER=gcc PYTHON_VERSION=3.7 NUMPY_VERSION=1.16 From 43d4ab0252585ac99581c2dd30e340e52db0f3ce Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 15:51:21 +1000 Subject: [PATCH 02/10] Huh! The tests were only running on master --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f04f6667..05750946 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,7 +132,3 @@ script: - make tests CC=$COMPILER - make -C docs html - if [[ "${DOCTEST}" == "true" ]]; then make -C docs doctest ; fi - -branches: - only: - - master From 0fa492a8b2a86ea43cf24d9dc30c4ae3f7529ef2 Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 15:56:31 +1000 Subject: [PATCH 03/10] Show more info about the compiler --- .travis.yml | 3 +++ common.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05750946..c3ee787a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -123,6 +123,9 @@ install: - python -m pip install --upgrade pip - python -m pip install --ignore-installed certifi --upgrade - python -m pip install sphinx>=1.8 + - export CC=$COMPILER + - which $COMPILER + - $COMPILER --version - make -r CC=$COMPILER - make install CC=$COMPILER - python -m pip install -e . diff --git a/common.mk b/common.mk index 234e8105..29c90145 100644 --- a/common.mk +++ b/common.mk @@ -177,7 +177,7 @@ ifeq ($(DO_CHECKS), 1) # Add the -Werror flag if running on some continuous integration provider ifeq ($(CORRFUNC_CI), true) - CFLAGS += -Werror -Wno-unknown-warning-option -Wimplicit-fallthrough=1 + CFLAGS += -Werror -Wimplicit-fallthrough=1 -Wno-unknown-warning-option endif GSL_FOUND := $(shell gsl-config --version 2>/dev/null) From 2077130eb66ff744ef385d1040b5eec787aeef5a Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 16:35:46 +1000 Subject: [PATCH 04/10] Disabling implicit-fallthrough-warning on travis --- .travis.yml | 5 ++--- common.mk | 7 ++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3ee787a..41bc65b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ env: # sources: # - ubuntu-toolchain-r-test # packages: -# - gcc-6.4 -# - libgsl0-dev +# - gcc-6 + matrix: fast_finish: true @@ -50,7 +50,6 @@ matrix: before_install: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh - - os: osx osx_image: xcode8 compiler: clang diff --git a/common.mk b/common.mk index 29c90145..25b44924 100644 --- a/common.mk +++ b/common.mk @@ -177,7 +177,12 @@ ifeq ($(DO_CHECKS), 1) # Add the -Werror flag if running on some continuous integration provider ifeq ($(CORRFUNC_CI), true) - CFLAGS += -Werror -Wimplicit-fallthrough=1 -Wno-unknown-warning-option + CFLAGS += -Werror -Wno-unknown-warning-option + endif + + # Add the implicit-fallthrough option *if not on* TRAVIS + ifneq ($(TRAVIS), true) + -CFLAGS += -Wimplicit-fallthrough=1 endif GSL_FOUND := $(shell gsl-config --version 2>/dev/null) From 76e21c1385fcf9876ef1ece2bc5d70f8af94715b Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 17:29:20 +1000 Subject: [PATCH 05/10] Updating to gcc-7 on all distros --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41bc65b8..907d912b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,12 @@ env: - DOCTEST=true - CORRFUNC_CI=true -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - gcc-6 +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-7 matrix: @@ -113,6 +113,7 @@ matrix: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh install: + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then eval "CC=gcc-7" ; fi - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - conda create -q --yes -n test python=$PYTHON_VERSION From 9d1ed7ef555b3a773af72eb42f27686dd1c8c29f Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 17:36:01 +1000 Subject: [PATCH 06/10] Unsure if gcc-7 worked --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 907d912b..8d19d2c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,7 @@ matrix: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh install: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then eval "CC=gcc-7" ; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export COMPILER=gcc-7 ; fi - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - conda create -q --yes -n test python=$PYTHON_VERSION From f1b67cf314dc84d025dfb9b688b3c7ebb4722bee Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 17:45:50 +1000 Subject: [PATCH 07/10] Use gcc-6 on trusty and gcc-7 on xenial --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d19d2c5..79f7974a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ addons: sources: - ubuntu-toolchain-r-test packages: + - gcc-6 - gcc-7 @@ -68,7 +69,7 @@ matrix: dist: trusty sudo: required compiler: gcc - env: COMPILER=gcc PYTHON_VERSION=2.7 + env: COMPILER=gcc-6 PYTHON_VERSION=2.7 before_install: - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh @@ -76,7 +77,7 @@ matrix: dist: trusty sudo: required compiler: gcc - env: COMPILER=gcc PYTHON_VERSION=3.5 + env: COMPILER=gcc-6 PYTHON_VERSION=3.5 before_install: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh @@ -84,7 +85,7 @@ matrix: dist: xenial sudo: required compiler: gcc - env: COMPILER=gcc PYTHON_VERSION=2.7 + env: COMPILER=gcc-7 PYTHON_VERSION=2.7 before_install: - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh @@ -92,7 +93,7 @@ matrix: dist: xenial sudo: required compiler: gcc - env: COMPILER=gcc PYTHON_VERSION=3.5 + env: COMPILER=gcc-7 PYTHON_VERSION=3.5 before_install: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh @@ -100,7 +101,7 @@ matrix: dist: xenial sudo: required compiler: gcc - env: COMPILER=gcc PYTHON_VERSION=3.6 + env: COMPILER=gcc-7 PYTHON_VERSION=3.6 before_install: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh @@ -108,12 +109,11 @@ matrix: dist: xenial sudo: required compiler: gcc - env: COMPILER=gcc PYTHON_VERSION=3.7 NUMPY_VERSION=1.16 + env: COMPILER=gcc-7 PYTHON_VERSION=3.7 NUMPY_VERSION=1.16 before_install: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh install: - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export COMPILER=gcc-7 ; fi - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - conda create -q --yes -n test python=$PYTHON_VERSION From 786a752d37f15019f4c8caf21e8c996506634d42 Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 17:48:37 +1000 Subject: [PATCH 08/10] Revert back to default gcc (4.8) on trusty --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79f7974a..e5610311 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ addons: sources: - ubuntu-toolchain-r-test packages: - - gcc-6 - gcc-7 @@ -69,7 +68,7 @@ matrix: dist: trusty sudo: required compiler: gcc - env: COMPILER=gcc-6 PYTHON_VERSION=2.7 + env: COMPILER=gcc PYTHON_VERSION=2.7 before_install: - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh @@ -77,7 +76,7 @@ matrix: dist: trusty sudo: required compiler: gcc - env: COMPILER=gcc-6 PYTHON_VERSION=3.5 + env: COMPILER=gcc PYTHON_VERSION=3.5 before_install: - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh From 243f9fc25e38bf8eefed97f2794ae7a19d7e788a Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 18:03:52 +1000 Subject: [PATCH 09/10] No need to run doctest on legacy setup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e5610311..c328cf27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ matrix: dist: trusty sudo: required compiler: gcc - env: COMPILER=gcc PYTHON_VERSION=2.7 + env: COMPILER=gcc PYTHON_VERSION=2.7 DOCTEST=false before_install: - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh From b7289781ca8a72ae92d6362b07a48be76f7c024f Mon Sep 17 00:00:00 2001 From: Manodeep Sinha Date: Thu, 11 Jun 2020 18:32:39 +1000 Subject: [PATCH 10/10] Updated changelog [ci skip] --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 321e4d36..90f9baa5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -19,6 +19,7 @@ Enhancements ------------ - A new helper routine to find the combination of (RA, DEC) refinements that produces fastest runtime in ``DDtheta_mocks`` [#216] - Further testing via GitHub Actions [#220] +- Added Ubuntu-Xenial on Travis [#222] Bug fixes ----------