From 35d095b9b7ed61e167fe68cc2a230cdb3ef29096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Fredrik=20Ki=C3=A6r?= <31612826+anders-kiaer@users.noreply.github.com> Date: Thu, 9 Jul 2020 08:14:23 +0200 Subject: [PATCH 1/4] Update GitHub actions workflow --- .github/workflows/flownet.yml | 12 ++++++------ src/flownet/ahm/_assisted_history_matching.py | 2 +- src/flownet/data/from_flow.py | 2 +- src/flownet/prediction/_run_pred.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/flownet.yml b/.github/workflows/flownet.yml index 355e83df5..ca6a61a0a 100644 --- a/.github/workflows/flownet.yml +++ b/.github/workflows/flownet.yml @@ -28,27 +28,27 @@ jobs: uses: actions/checkout@v2 - name: 🐍 Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - name: 📁 Cache virtual environment id: cache-venv - uses: actions/cache@v1 + uses: actions/cache@v2 with: - path: $VENV_PATH - key: ${{ runner.os }}-${{ hashFiles('setup.py') }}-${{ hashFiles('build_environment.sh') }} + path: ${{ env.VENV_PATH }} + key: ${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('build_environment.sh') }}-${{ hashFiles('setup.py') }} - name: 📦 Install non-python dependencies run: sudo bash ./apt_install.sh - name: 🏗️ Build Python environment - run: bash ./build_environment.sh $VENV_PATH /usr/bin/flow ${{ steps.cache-venv.outputs.cache-hit }} + if: steps.cache-venv.outputs.cache-hit != 'true' + run: bash ./build_environment.sh $VENV_PATH /usr/bin/flow - name: 📦 Install FlowNet run: | source $VENV_PATH/bin/activate - pip install "astroid==2.3.3" "pylint==2.4.4" # Bugs in what is currently the latest releases pip install . - name: 📦 Install test dependencies diff --git a/src/flownet/ahm/_assisted_history_matching.py b/src/flownet/ahm/_assisted_history_matching.py index baf837bf3..83ac5819d 100644 --- a/src/flownet/ahm/_assisted_history_matching.py +++ b/src/flownet/ahm/_assisted_history_matching.py @@ -166,7 +166,7 @@ def report(self): for distribution in parameter.random_variables } - print(f"Unique parameter distributions:") + print("Unique parameter distributions:") print("\nDistribution Minimum Mean Max") print("------------------------------------------------------------------") diff --git a/src/flownet/data/from_flow.py b/src/flownet/data/from_flow.py index d9a749a69..0c8fb3d6a 100644 --- a/src/flownet/data/from_flow.py +++ b/src/flownet/data/from_flow.py @@ -172,7 +172,7 @@ def _production_data(self) -> pd.DataFrame: if df_production_data["WSTAT"].isna().all(): warnings.warn( - f"No WSTAT:* summary vectors in input case - setting default well status to OPEN." + "No WSTAT:* summary vectors in input case - setting default well status to OPEN." ) wstat_default = "OPEN" else: diff --git a/src/flownet/prediction/_run_pred.py b/src/flownet/prediction/_run_pred.py index 6063dd5d2..d4e4a85d9 100644 --- a/src/flownet/prediction/_run_pred.py +++ b/src/flownet/prediction/_run_pred.py @@ -25,7 +25,7 @@ def _run_ert(output_folder: pathlib.Path) -> None: """ subprocess.run( - f"ert ensemble_experiment pred_config.ert", + "ert ensemble_experiment pred_config.ert", cwd=output_folder, shell=True, check=True, From 326911ac26092628957cfc39dd2423e5cca6c852 Mon Sep 17 00:00:00 2001 From: Wouter de Bruin Date: Sun, 12 Jul 2020 11:44:56 +0200 Subject: [PATCH 2/4] Type Dict to dict --- src/flownet/ahm/_run_ahm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/flownet/ahm/_run_ahm.py b/src/flownet/ahm/_run_ahm.py index 0a769ac63..df98f22d0 100644 --- a/src/flownet/ahm/_run_ahm.py +++ b/src/flownet/ahm/_run_ahm.py @@ -1,5 +1,5 @@ import argparse -from typing import Dict, Union, List, Optional +from typing import Union, List, Optional import numpy as np import pandas as pd @@ -62,7 +62,7 @@ def _find_training_set_fraction( def _get_distribution( - parameters: Union[str, List[str]], parameters_config: Dict, index: list + parameters: Union[str, List[str]], parameters_config: dict, index: list ) -> pd.DataFrame: """ Create the distribution min-max for one or more parameters @@ -300,7 +300,7 @@ def run_flownet_history_matching( # Fault transmissibility # ######################################### - if isinstance(network.faults, Dict): + if isinstance(network.faults, dict): fault_mult_dist_values = _get_distribution( ["fault_mult"], config.model_parameters, list(network.faults.keys()), ) From c7142e2c7c83a66e99f1186dc5bb28336495698f Mon Sep 17 00:00:00 2001 From: Wouter de Bruin Date: Tue, 14 Jul 2020 11:01:41 +0200 Subject: [PATCH 3/4] Add Norne Dataset Extraction Job if cache is used --- .github/workflows/flownet.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/flownet.yml b/.github/workflows/flownet.yml index ca6a61a0a..d9316fcef 100644 --- a/.github/workflows/flownet.yml +++ b/.github/workflows/flownet.yml @@ -46,6 +46,10 @@ jobs: if: steps.cache-venv.outputs.cache-hit != 'true' run: bash ./build_environment.sh $VENV_PATH /usr/bin/flow + - name: 🏗️ Extract Norne Dataset + if: steps.cache-venv.outputs.cache-hit == 'true' + run: tar -zxvf tests/data/norne.tar.gz -C tests/data/ + - name: 📦 Install FlowNet run: | source $VENV_PATH/bin/activate From 9040f05640a2602411cb9c633f1b76b22c5bca9a Mon Sep 17 00:00:00 2001 From: Wouter de Bruin Date: Tue, 14 Jul 2020 12:13:17 +0200 Subject: [PATCH 4/4] remove indent --- .github/workflows/flownet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flownet.yml b/.github/workflows/flownet.yml index d9316fcef..3397b2439 100644 --- a/.github/workflows/flownet.yml +++ b/.github/workflows/flownet.yml @@ -47,8 +47,8 @@ jobs: run: bash ./build_environment.sh $VENV_PATH /usr/bin/flow - name: 🏗️ Extract Norne Dataset - if: steps.cache-venv.outputs.cache-hit == 'true' - run: tar -zxvf tests/data/norne.tar.gz -C tests/data/ + if: steps.cache-venv.outputs.cache-hit == 'true' + run: tar -zxvf tests/data/norne.tar.gz -C tests/data/ - name: 📦 Install FlowNet run: |