From eb4fe1d306b351def748e1e53b07705a0adbbb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Berland?= Date: Thu, 16 Apr 2020 09:41:28 +0200 Subject: [PATCH] Rebase to github actions --- .github/workflows/fmu-ensemble.yml | 4 +++ .travis.yml | 55 ------------------------------ 2 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/fmu-ensemble.yml b/.github/workflows/fmu-ensemble.yml index 2f13b032..d3f8f19f 100644 --- a/.github/workflows/fmu-ensemble.yml +++ b/.github/workflows/fmu-ensemble.yml @@ -20,7 +20,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: + FMU_CONCURRENCY: ['True', 'False'] python-version: ['2.7', '3.6', '3.7', '3.8'] + exclude: + - python-version: '2.7' + FMU_CONCURRENCY: 'True' steps: - name: Checkout commit locally diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 26eb4b2f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,55 +0,0 @@ -language: python - -os: - - linux - -python: - - "2.7" - - "3.6" - - "3.7" - - "3.8" - -env: - - FMU_CONCURRENCY=True - - FMU_CONCURRENCY=False - -jobs: - exclude: - - python: "2.7" - env: FMU_CONCURRENCY=True - -addons: - apt: - packages: - - libsnappy-dev - -before_install: - - sudo apt-get -qq update - - pip freeze | grep -vw "pip" | xargs pip uninstall -y - - pip install --upgrade pip - -install: - - ls - - pip install . - - pip install .[tests] - - pip install concurrent || echo # Supposed to fail on Py27 - -script: - - python -c "import fmu.ensemble" - - pytest tests/ - - pip install .[parquet] - - pytest tests/test_virtualensemble.py - - sphinx-apidoc -H "API for fmu.ensemble" -o ./docs ./src/fmu - - python setup.py build_sphinx - - touch build/sphinx/html/.nojekyll - -deploy: - - provider: pages - skip_cleanup: true - local_dir: ./build/sphinx/html - github_token: - secure: "YIyL0mZJxF7s4tbQj3u1CwRA7PJJfKFL17uIN1zSXPijrL890bX8Uc48IbYT23/41oAkd5a36iJBH20lYj0Q4PHcewZDtxIzZ3u3ul8CshcQ35yLNN0GU8KMX2sMTo4dLkiyvlW+Rj774ZWsAe2vy0brs4vIyRWOgc13HldE3P3n4AF7YmptB14TqXYt1CWyB/mdjMYqY/PW1kVdLJYycj/kPPqoLjqPSC7yoaPLW+Y/LDZIetqssP3cDnj+OuYLooo5fixRGbROb4EVnDuzcW5+6Bt83pRsjtxVEQ15UVj2t3PVIJQnjmxQtTXwR7iLHIV+zKX+gHdGrAg5eBrbTx9xMuO12QYDEhuclooEXQwTS4sB9yryearau3uk+oXEfcKfS4GjXIubG2nTiDitKO5Ri9sFrvUp83+IvADpycSN4xvP6v1LabQ6d3reDeftwm63AGJAjnOPgp7ok0WmTYZ145WMpThhOqqdFGj00UdxoG18P/TZnm5JX6rSAgAIvoFYI8hlBfh8427w5n42zpGvc6ITJusVlfIw3Bi0brnRg5pvRY0mSFsHWjvHsIHpGV0bt2FLu/k7vK7xkVm3WEp516RtW2+SVUPGCn+yrUNcYmlal93+rijBh4/JCe/iPy0gRSrm0TS+LsGpPd3TcqDR9MriJL7Cr5L1jwNZQl0=" - keep_history: true - on: - branch: master - python: "3.6"