Rebase to github actions

equinor · Apr 16, 2020 · 4f7cfbb · 4f7cfbb
1 parent 8706924
commit 4f7cfbb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 56 deletions.
diff --git a/.github/workflows/fmu-ensemble.yml b/.github/workflows/fmu-ensemble.yml
@@ -20,7 +20,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['2.7', '3.6', '3.7', '3.8']
+        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
diff --git a/setup.py b/setup.py
@@ -20,6 +20,7 @@
     history = history_file.read()
 
 REQUIREMENTS = [
+    "concurrent; python_version >= '3'",
     "libecl",
     "numpy",
     "pandas>0.23.0",