From 42db5dab0e1be85d5339546f80c56b92de323b3f Mon Sep 17 00:00:00 2001 From: larsevj Date: Wed, 3 Sep 2025 15:29:57 +0200 Subject: [PATCH 1/3] Update github actions versions --- .github/workflows/codecov.yml | 4 ++-- .github/workflows/subscript.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 892ae2e2e..58b512f27 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -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 @@ -53,6 +53,6 @@ jobs: 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 }} diff --git a/.github/workflows/subscript.yml b/.github/workflows/subscript.yml index ef5939806..679b8eeab 100644 --- a/.github/workflows/subscript.yml +++ b/.github/workflows/subscript.yml @@ -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 From f0a7661e6f9d648fa58a4cfa03c4737aa1f7aea3 Mon Sep 17 00:00:00 2001 From: larsevj Date: Wed, 3 Sep 2025 15:34:37 +0200 Subject: [PATCH 2/3] Cleanup unused rips pinning in github workflows --- .github/workflows/codecov.yml | 10 +++++----- .github/workflows/subscript.yml | 11 ++--------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 58b512f27..0469f89c2 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -40,13 +40,13 @@ 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: | diff --git a/.github/workflows/subscript.yml b/.github/workflows/subscript.yml index 679b8eeab..da69b8807 100644 --- a/.github/workflows/subscript.yml +++ b/.github/workflows/subscript.yml @@ -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: | From f381c0228e9edbe8d10fd8a204cae468cee3cdf0 Mon Sep 17 00:00:00 2001 From: larsevj Date: Wed, 3 Sep 2025 15:35:08 +0200 Subject: [PATCH 3/3] Remove unneeded pinning of packages in pyproject.toml --- pyproject.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0e9a5b4ef..03d6d16ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,6 @@ requires = [ "setuptools>=45.0", "setuptools_scm[toml]>=6.2", - "wheel>=0.38.1", ] build-backend = "setuptools.build_meta" @@ -61,7 +60,6 @@ tests = [ "pytest-cov", "pytest-mock", "pytest-xdist", - "PyQt5-sip", "rstcheck", "rstcheck-core", "ruff", @@ -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",