Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
sudo apt-get update
sudo apt-get install libegl1

- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Setup Python
uses: actions/setup-python@v5
Expand All @@ -40,19 +40,19 @@ jobs:

- name: Install subscript and test dependencies
run: |
pip install pip -U
pip install .[tests]
pip install -U pip
pip install ".[tests]"

- name: Force correct RIPS version
- name: Log OPM-Flow and ResInsight version
run: |
ResInsight --console --help | grep "ResInsight v. 2021.06" && pip install rips==2021.6.0.1 || true
ResInsight --console --help | grep "ResInsight v. 2020.10" && pip install rips==2020.10.0.2 || true
flow --version
ResInsight --console --version

- name: Generate coverage report
run: |
pytest tests --disable-warnings --cov=subscript --cov-report=xml

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
13 changes: 3 additions & 10 deletions .github/workflows/subscript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
sudo apt-get install libegl1

- name: Checkout commit locally
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

Expand All @@ -53,15 +53,8 @@ jobs:
- name: Install subscript with dependencies
if: ${{ always() }}
run: |
pip install --upgrade pip
pip install .[tests,docs]

- name: Force correct RIPS version
run: |
ResInsight --console --help | grep "ResInsight v. 2021.06" \
&& pip install rips==2021.6.0.1 || true
ResInsight --console --help | grep "ResInsight v. 2020.10" \
&& pip install rips==2020.10.0.2 || true
pip install -U pip
pip install ".[tests, docs]"

- name: Log OPM-Flow and ResInsight version
run: |
Expand Down
6 changes: 2 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
requires = [
"setuptools>=45.0",
"setuptools_scm[toml]>=6.2",
"wheel>=0.38.1",
]
build-backend = "setuptools.build_meta"

Expand Down Expand Up @@ -61,7 +60,6 @@ tests = [
"pytest-cov",
"pytest-mock",
"pytest-xdist",
"PyQt5-sip",
"rstcheck",
"rstcheck-core",
"ruff",
Expand All @@ -71,9 +69,9 @@ tests = [
]
docs = [
"autoapi",
"sphinx<8.2.0",
"sphinx",
"sphinx-argparse",
"sphinx-autodoc-typehints<2.4",
"sphinx-autodoc-typehints",
"sphinx-copybutton",
"sphinx-togglebutton",
"sphinx_rtd_theme",
Expand Down