diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 892ae2e2e..0469f89c2 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 @@ -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 }} diff --git a/.github/workflows/subscript.yml b/.github/workflows/subscript.yml index ef5939806..da69b8807 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 @@ -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: | 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",