Unpin setuptools

equinor · Sep 19, 2023 · c7b0a5a · c7b0a5a
1 parent d1ae20d
commit c7b0a5a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -154,7 +154,7 @@ def install_build_requires() -> None:
         "install",
         "--upgrade",
         "pip",
-        "setuptools<64",
+        "setuptools",
         "wheel",
         "tomli",
         *extra_req,