Merge branch 'ci'

Author: mbdevpl

.travis.yml

@@ -1,5 +1,10 @@
 sudo: required
 language: generic
+addons:
+  homebrew:
+    packages:
+      - ant
+      - pyenv
 matrix:
   include:
     - os: linux
@@ -9,19 +14,15 @@ matrix:
     - os: linux
       language: python
       python: "3.6"
-      env: TRAVIS_JDK_VERSION=oraclejdk8
-    - os: linux
-      language: python
-      python: "3.6"
-      env: TRAVIS_JDK_VERSION=oraclejdk9
+      env: TRAVIS_JDK_VERSION=openjdk7
     - os: linux
       language: python
       python: "3.6"
-      env: TRAVIS_JDK_VERSION=openjdk7
+      env: TRAVIS_JDK_VERSION=openjdk8
     - os: linux
       language: python
       python: "3.6"
-      env: TRAVIS_JDK_VERSION=openjdk8
+      env: TRAVIS_JDK_VERSION=oraclejdk9
     - os: linux
       dist: xenial
       sudo: true
@@ -31,17 +32,17 @@ matrix:
     - os: osx
       language: generic
       env:
-        - TRAVIS_PYTHON_VERSION="3.5.5"
+        - TRAVIS_PYTHON_VERSION="3.5"
         - TRAVIS_JDK_VERSION=oraclejdk8
     - os: osx
       language: generic
       env:
-        - TRAVIS_PYTHON_VERSION="3.6.6"
+        - TRAVIS_PYTHON_VERSION="3.6"
         - TRAVIS_JDK_VERSION=oraclejdk8
     - os: osx
       language: generic
       env:
-        - TRAVIS_PYTHON_VERSION="3.7.0"
+        - TRAVIS_PYTHON_VERSION="3.7"
         - TRAVIS_JDK_VERSION=oraclejdk8
   allow_failures:
     - python: "3.7"
@@ -50,11 +51,11 @@ before_install:
   - |
     set -e
     if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      brew update
-      brew install pyenv || brew upgrade pyenv
+      if ! [[ ${TRAVIS_PYTHON_VERSION} =~ .*-dev$ ]] ; then
+        TRAVIS_PYTHON_VERSION="$(pyenv install --list | grep -E " ${TRAVIS_PYTHON_VERSION}(\.[0-9brc]+)+$" | tail -n 1 | sed -e 's/^[[:space:]]*//')"
+      fi
       pyenv install "${TRAVIS_PYTHON_VERSION}"
-      export PATH="$HOME/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin:${PATH}"
-      brew install ant || brew upgrade ant
+      export PATH="${HOME}/.pyenv/versions/${TRAVIS_PYTHON_VERSION}/bin:${PATH}"
     fi
     set +e
   - |
@@ -91,7 +92,7 @@ install:
 
 script:
   - |
-    if [[ "${TRAVIS_JDK_VERSION}" == "oraclejdk9" ]]; then
+    if [[ "${TRAVIS_JDK_VERSION}" == "openjdk7" ]]; then
       export TEST_DEPENDENCIES=1
       export TEST_LONG=1
     fi

appveyor.yml

@@ -5,14 +5,14 @@ environment:
     - ARCHITECTURE: "x86"
       PYTHON_VERSION: "3.5"
       PYTHON: "C:\\Python35"
-      JAVA_VERSION: "jdk8"
-      JAVA: "C:\\Program Files (x86)\\Java\\jdk1.8.0"
+      JAVA_VERSION: "jdk9"
+      JAVA: "C:\\Program Files (x86)\\Java\\jdk9"
       ANT: "1.10.5"
     - ARCHITECTURE: "x64"
       PYTHON_VERSION: "3.5"
       PYTHON: "C:\\Python35-x64"
-      JAVA_VERSION: "jdk8"
-      JAVA: "C:\\Program Files\\Java\\jdk1.8.0"
+      JAVA_VERSION: "jdk9"
+      JAVA: "C:\\Program Files\\Java\\jdk9"
       ANT: "1.10.5"
     - ARCHITECTURE: "x86"
       PYTHON_VERSION: "3.6"
@@ -38,17 +38,29 @@ environment:
       JAVA_VERSION: "jdk8"
       JAVA: "C:\\Program Files\\Java\\jdk1.8.0"
       ANT: "1.10.5"
+    - ARCHITECTURE: "x86"
+      PYTHON_VERSION: "3.6"
+      PYTHON: "C:\\Python36"
+      JAVA_VERSION: "jdk9"
+      JAVA: "C:\\Program Files (x86)\\Java\\jdk9"
+      ANT: "1.10.5"
+    - ARCHITECTURE: "x64"
+      PYTHON_VERSION: "3.6"
+      PYTHON: "C:\\Python36-x64"
+      JAVA_VERSION: "jdk9"
+      JAVA: "C:\\Program Files\\Java\\jdk9"
+      ANT: "1.10.5"
     - ARCHITECTURE: "x86"
       PYTHON_VERSION: "3.7"
       PYTHON: "C:\\Python37"
-      JAVA_VERSION: "jdk8"
-      JAVA: "C:\\Program Files (x86)\\Java\\jdk1.8.0"
+      JAVA_VERSION: "jdk9"
+      JAVA: "C:\\Program Files (x86)\\Java\\jdk9"
       ANT: "1.10.5"
     - ARCHITECTURE: "x64"
       PYTHON_VERSION: "3.7"
       PYTHON: "C:\\Python37-x64"
-      JAVA_VERSION: "jdk8"
-      JAVA: "C:\\Program Files\\Java\\jdk1.8.0"
+      JAVA_VERSION: "jdk9"
+      JAVA: "C:\\Program Files\\Java\\jdk9"
       ANT: "1.10.5"
 
 init:
@@ -76,7 +88,7 @@ install:
   # Java
   - python -m open_fortran_parser --dev-deps
   - set CLASSPATH=%cd%\\lib\\*;%CLASSPATH%
-  - ant
+  - ant -Dpython=python
   - set CLASSPATH=%cd%\\dist\\*;%CLASSPATH%
   # Java tests
   - ps: Invoke-WebRequest "https://github.com/mbdevpl/open-fortran-parser-xml/releases/download/v0.2.0/org.jacoco.agent-0.8.1-runtime.jar" -OutFile "lib\\org.jacoco.agent-0.8.1-runtime.jar"
@@ -86,8 +98,8 @@ build: off
 
 test_script:
   - set TEST_PACKAGING=1
-  - if [%JAVA_VERSION%]==[jdk8] set TEST_DEPENDENCIES=1
-  - if [%JAVA_VERSION%]==[jdk8] set TEST_LONG=1
+  - if [%JAVA_VERSION%]==[jdk7] set TEST_DEPENDENCIES=1
+  - if [%JAVA_VERSION%]==[jdk7] set TEST_LONG=1
   - set TEST_COVERAGE=1
   - python -m coverage run --branch --source . -m unittest -v