diff --git a/.github/workflows/doctest.yml b/.github/workflows/doctest.yml index 1bb29c70392..0326c75fc65 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/doctest.yml @@ -35,7 +35,7 @@ jobs: - name: Install with dependencies run: | - pip install -r dev-requirements.txt + pip install pytest - name: Test doctest run: | diff --git a/dev-requirements.txt b/dev-requirements.txt index ee478167464..4a1d4bca61c 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -8,7 +8,6 @@ hypothesis<=6.83.0;python_version=='3.8' # ipython pinned to 8.12.2 for python 3 hypothesis;python_version>='3.9' jsonpath_ng jupytext -oil_reservoir_synthesizer pytest-asyncio pytest-benchmark pytest-cov @@ -21,9 +20,8 @@ pytest-snapshot pytest-timeout pytest-xdist pytest>6 +oil_reservoir_synthesizer requests -scikit-build -setuptools_scm sortedcontainers sphinx<7.2 sphinx-argparse diff --git a/pyproject.toml b/pyproject.toml index 52d5353b0e9..8d84a0b904b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,14 +1,14 @@ [build-system] requires = [ - "setuptools<64", + "setuptools", "setuptools_scm[toml]>=6.2", "wheel", "scikit-build", "cmake", "ninja", - "ecl", "conan<2", + "ecl >= 2.14.1", "pybind11>=2.10.0", # If this comes out of sync with the version installed by Conan please update the version in CMakeLists "grpcio-tools", ] diff --git a/script/build b/script/build index fdfd1a4b14b..8b51179a561 100755 --- a/script/build +++ b/script/build @@ -154,7 +154,7 @@ def install_build_requires() -> None: "install", "--upgrade", "pip", - "setuptools<64", + "setuptools", "wheel", "tomli", *extra_req,