From 5b5f2a53d1db83717e3dedc08f18a3027d23584b Mon Sep 17 00:00:00 2001
From: Hans Kallekleiv <hakal@statoil.com>
Date: Tue, 5 Jan 2021 12:17:47 +0100
Subject: [PATCH] Support Pandas 1.2.0. Remove Pandas 0.24 from CI

---
 .github/workflows/subsurface.yml                  | 15 ++++-----------
 setup.py                                          |  2 +-
 .../_reservoir_simulation_timeseries_regional.py  |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/subsurface.yml b/.github/workflows/subsurface.yml
index ffea9272c0..77c6bcb2d9 100644
--- a/.github/workflows/subsurface.yml
+++ b/.github/workflows/subsurface.yml
@@ -23,11 +23,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.6', '3.7', '3.8']
-        pandas-version: ['0.24.2', '1.*']  # Necessary as long as RHEL6 is used internally
-        exclude:
-          # Skip Python 3.8 and Pandas 0.24.2 combination due to missing 3.8 wheel for that specific pandas version
-          - python-version: '3.8'
-            pandas-version: '0.24.2'
 
     steps:
 
@@ -54,7 +49,6 @@ jobs:
         if [[ $(pip freeze) ]]; then
           pip freeze | grep -vw "pip" | xargs pip uninstall -y
         fi
-        pip install 'pandas==${{ matrix.pandas-version }}'
         pip install .
         # There are dependencies which we can't have in setup.py yet due to limitations in internal deployment system ("komodo"):
         pip install libecl ecl2df opm
@@ -71,7 +65,6 @@ jobs:
       run: pip freeze
 
     - name: 🕵️ Check code style & linting
-      if: matrix.pandas-version == '1.*'
       run: |
         black --check webviz_subsurface tests setup.py
         pylint webviz_subsurface tests setup.py
@@ -106,13 +99,13 @@ jobs:
         popd
 
     - name: 🐳 Update Docker Hub example image
-      if: github.event_name != 'schedule' && github.ref == 'refs/heads/master' && matrix.python-version == '3.6' && matrix.pandas-version == '1.*'
+      if: github.event_name != 'schedule' && github.ref == 'refs/heads/master' && matrix.python-version == '3.6'
       run: |
         echo ${{ secrets.dockerhub_webviz_token }} | docker login --username webviz --password-stdin
         docker push webviz/example_subsurface_image:equinor-theme
 
     - name: 🐳 Update review/test Docker example image
-      if: github.ref != 'refs/heads/master' && contains(github.event.head_commit.message, '[deploy test]') && matrix.python-version == '3.6' && matrix.pandas-version == '1.*'
+      if: github.ref != 'refs/heads/master' && contains(github.event.head_commit.message, '[deploy test]') && matrix.python-version == '3.6'
       run: |
         docker tag webviz/example_subsurface_image:equinor-theme ${{ secrets.review_docker_registry_url }}/${{ secrets.review_container_name }}
 
@@ -120,7 +113,7 @@ jobs:
         docker push ${{ secrets.review_docker_registry_url }}/${{ secrets.review_container_name }}
 
     - name: 🚢 Build and deploy Python package
-      if: github.event_name == 'release' && matrix.python-version == '3.6' && matrix.pandas-version == '1.*'
+      if: github.event_name == 'release' && matrix.python-version == '3.6'
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.pypi_webviz_token }}
@@ -130,7 +123,7 @@ jobs:
         twine upload dist/*
 
     - name: 📚 Update GitHub pages
-      if: github.event_name == 'release' && matrix.python-version == '3.6' && matrix.pandas-version == '1.*'
+      if: github.event_name == 'release' && matrix.python-version == '3.6'
       run: |
         cp -R ./docs_build ../docs_build
 
diff --git a/setup.py b/setup.py
index 89e8321ff1..e0e03eb552 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@
         # "opm>=2020.10.1; sys_platform=='linux'",
         "pandas>=0.24",
         "pillow>=6.1",
-        "pyscal>=0.4.1",
+        "pyscal>=0.7.2",
         "scipy>=1.2",
         "statsmodels>=0.12.1",  # indirect dependency through https://plotly.com/python/linear-fits/
         "webviz-config>=0.0.55",
diff --git a/webviz_subsurface/plugins/_reservoir_simulation_timeseries_regional.py b/webviz_subsurface/plugins/_reservoir_simulation_timeseries_regional.py
index 5c1ba98297..c20a504bc0 100644
--- a/webviz_subsurface/plugins/_reservoir_simulation_timeseries_regional.py
+++ b/webviz_subsurface/plugins/_reservoir_simulation_timeseries_regional.py
@@ -1416,7 +1416,7 @@ def get_fip_array_nodes(fip: str, smry_cols: list) -> List[str]:
             }
         )
     )
-    return [str(i) for i in sorted_int_list]
+    return sorted_int_list
 
 
 @webvizstore