From be9998e976a16c8c29524e87287ac445649d8bf1 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sat, 27 Jul 2019 17:05:44 -0500 Subject: [PATCH 01/17] Added support for travis-CI --- .travis.yml | 19 +++++++++++++++++++ tests/Makefile | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..e756997 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,19 @@ +language: python +dist: trusty +python: + - "3.7" + - "3.6" + - "3.5" +addons: + apt: + packages: + - gfortran + - libblas-dev + - liblapack-dev + - libopenmpi-dev + - openmpi-bin +script: + - cd tests + - make epw +git: + depth: 3 diff --git a/tests/Makefile b/tests/Makefile index b8ce7fd..107aa4f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -69,10 +69,10 @@ forpy_mod.o: ../forpy_mod.F90 $(FC) $(FFLAGS) -c -o $@ $< ../forpy_mod.F90: ../forpy_mod.fypp - python2 ../fypp.py ../forpy_mod.fypp ../forpy_mod.F90 + $(PYTHON) ../fypp.py ../forpy_mod.fypp ../forpy_mod.F90 %.F90: %.fypp - python2 ../fypp.py $< $@ + $(PYTHON) ../fypp.py $< $@ .PHONY: clean clean: From 105c2f8ca07fef5710ae23cb53b8fa4a3ff6e7d9 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sat, 27 Jul 2019 17:07:54 -0500 Subject: [PATCH 02/17] Fixed typo --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e756997..93099db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python dist: trusty python: - - "3.7" - "3.6" - "3.5" addons: @@ -14,6 +13,6 @@ addons: - openmpi-bin script: - cd tests - - make epw + - make git: depth: 3 From bb5b68411f3e5b61bed6a321f6d754dc0ac9afc3 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 19:19:16 -0500 Subject: [PATCH 03/17] Checking verion of gfortran --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 93099db..61701c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ addons: - libopenmpi-dev - openmpi-bin script: + - gfortran --version - cd tests - make git: From 6e922517e8b983244b8ef80816222cbec2cffbdd Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 19:22:38 -0500 Subject: [PATCH 04/17] Version of gfortran increased to 7 --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61701c9..ece9899 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,7 @@ python: addons: apt: packages: - - gfortran - - libblas-dev - - liblapack-dev - - libopenmpi-dev - - openmpi-bin + - gfortran-7 script: - gfortran --version - cd tests From 846105100e7b71c4a01c203f21982def8c060497 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 19:27:22 -0500 Subject: [PATCH 05/17] Which gfortran --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ece9899..9c0f708 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,9 @@ python: addons: apt: packages: - - gfortran-7 + - gfortran script: + - apt-cache search gfortran - gfortran --version - cd tests - make From 138154ab0f6e5eb19353618867eddea811817acf Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 19:32:08 -0500 Subject: [PATCH 06/17] Which gfortran --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c0f708..cbc5184 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,10 @@ python: - "3.5" addons: apt: + sources: + - ubuntu-toolchain-r-test packages: - - gfortran + - gfortran-8 script: - apt-cache search gfortran - gfortran --version From 98d137e2e8046bf7030483fda7b36a09b26ed1ed Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 19:38:43 -0500 Subject: [PATCH 07/17] Which gfortran --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbc5184..098c639 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,10 @@ addons: sources: - ubuntu-toolchain-r-test packages: - - gfortran-8 + - gfortran-7 script: - - apt-cache search gfortran - - gfortran --version + - gfortran-7 --version - cd tests - - make + - make FC=gfortran-7 git: depth: 3 From 3621399a89fb8389c9c21dae9e4f4fd137bc8496 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 19:50:55 -0500 Subject: [PATCH 08/17] Which gfortran --- .travis.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 098c639..bc625ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,11 @@ language: python -dist: trusty +dist: gcc-6 python: - "3.6" - "3.5" -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gfortran-7 script: - - gfortran-7 --version + - gfortran --version - cd tests - - make FC=gfortran-7 + - make FC=gfortran git: depth: 3 From 0b803569555f49a142267f8da31e236f4b5911ad Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 19:55:21 -0500 Subject: [PATCH 09/17] Which gfortran --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc625ea..e4c9363 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: python -dist: gcc-6 +dist: gcc:6 python: - "3.6" - "3.5" From 6edf3bc1449d9b571cc21f3575156ddc2486b63a Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 20:03:52 -0500 Subject: [PATCH 10/17] Which gfortran --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4c9363..6e2c738 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ -language: python -dist: gcc:6 -python: - - "3.6" - - "3.5" +language: generic +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gfortran-6 script: - gfortran --version - cd tests - make FC=gfortran -git: - depth: 3 From 257b199ae3994225d3f64d543a74d94af9f5c946 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 20:06:44 -0500 Subject: [PATCH 11/17] Which gfortran --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e2c738..099ebc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ language: generic +dist: gcc:6 addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - - gfortran-6 + - python3 script: - gfortran --version + - gfortran-6 --version - cd tests - - make FC=gfortran + - make FC=gfortran-6 From cb1dfde83b16b5c7685a7dee14b50405591771ed Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 20:17:34 -0500 Subject: [PATCH 12/17] Which gfortran --- .travis.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 099ebc5..feba84a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,23 @@ -language: generic -dist: gcc:6 -addons: - apt: - packages: - - python3 +language: python + +python: + - 3.6 + +matrix: + include: + - os: linux + dist: trusty + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gfortran-6 + - python-pip + env: + - FC=gfortran-6 + script: - - gfortran --version - - gfortran-6 --version + - ${FC} --version - cd tests - - make FC=gfortran-6 + - make FC=${FC} From d9d131b3606dd4f57819e6f9920abb6d7f3e766b Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 20:20:33 -0500 Subject: [PATCH 13/17] Which gfortran --- .travis.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.travis.yml b/.travis.yml index feba84a..ba4334e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,39 @@ matrix: - python-pip env: - FC=gfortran-6 + - os: linux + dist: trusty + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gfortran-7 + - python-pip + env: + - FC=gfortran-7 + - os: linux + dist: trusty + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gfortran-8 + - python-pip + env: + - FC=gfortran-8 + - os: linux + dist: trusty + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gfortran-9 + - python-pip + env: + - FC=gfortran-9 script: - ${FC} --version From 1ae8bdceb18d48b1869254e9513c0be2c20506c7 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Sun, 28 Jul 2019 20:27:46 -0500 Subject: [PATCH 14/17] Which gfortran --- .travis.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba4334e..1e059cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,28 +5,6 @@ python: matrix: include: - - os: linux - dist: trusty - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gfortran-6 - - python-pip - env: - - FC=gfortran-6 - - os: linux - dist: trusty - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - gfortran-7 - - python-pip - env: - - FC=gfortran-7 - os: linux dist: trusty addons: From baf91222fd18af39a35340ee5df388b25268e697 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Mon, 29 Jul 2019 08:14:31 -0500 Subject: [PATCH 15/17] Which gfortran --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1e059cc..7830c61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,17 @@ python: matrix: include: + - os: linux + dist: trusty + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gfortran-7 + - python-pip + env: + - FC=gfortran-7 - os: linux dist: trusty addons: From 241dbe502c7aa493df709372ba59465872e8bf13 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Mon, 29 Jul 2019 08:16:53 -0500 Subject: [PATCH 16/17] Which gfortran --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7830c61..e77847b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,14 @@ language: python python: - 3.6 + - 3.5 + + +sudo: false + +cache: + apt: true + pip: true matrix: include: From 94f21ab12065abeb6ca12f69bb29b1bf1639f038 Mon Sep 17 00:00:00 2001 From: Marco Govoni Date: Mon, 29 Jul 2019 08:18:51 -0500 Subject: [PATCH 17/17] Which gfortran --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e77847b..a435967 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ language: python python: - - 3.6 - - 3.5 - + - 3.6 sudo: false