diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7197c0b308c..6276fe1c17b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -45,7 +45,6 @@ repos: - types-requests - types-paramiko - types-PyYAML - - types-setuptools - types-psutil # Typed libraries - numpy diff --git a/continuous_integration/recipes/dask/meta.yaml b/continuous_integration/recipes/dask/meta.yaml index 90c69295125..01746b7b51f 100644 --- a/continuous_integration/recipes/dask/meta.yaml +++ b/continuous_integration/recipes/dask/meta.yaml @@ -19,6 +19,7 @@ build: requirements: host: - python >=3.8 + - setuptools run: - python >=3.8 - dask-core >={{ dask_version }} diff --git a/continuous_integration/recipes/distributed/meta.yaml b/continuous_integration/recipes/distributed/meta.yaml index 13ebf926096..8222c1a07fd 100644 --- a/continuous_integration/recipes/distributed/meta.yaml +++ b/continuous_integration/recipes/distributed/meta.yaml @@ -54,11 +54,12 @@ outputs: build: - {{ compiler('c') }} # [cython_enabled] host: - - python + - python >=3.8 - pip + - setuptools - cython # [cython_enabled] run: - - python + - python >=3.8 - click >=6.6 - cloudpickle >=1.5.0 - cytoolz >=0.8.2 diff --git a/distributed/tests/test_client.py b/distributed/tests/test_client.py index 7b419000327..7479b8cff48 100644 --- a/distributed/tests/test_client.py +++ b/distributed/tests/test_client.py @@ -1637,6 +1637,8 @@ def g(): @gen_cluster(client=True) async def test_upload_file_egg(c, s, a, b): + pytest.importorskip("setuptools") + def g(): import package_1 import package_2 @@ -1657,9 +1659,8 @@ def g(): with open(os.path.join(dirname, "setup.py"), "w") as f: f.write("from setuptools import setup, find_packages\n") f.write( - 'setup(name="my_package", packages=find_packages(), version="{}")\n'.format( - value - ) + 'setup(name="my_package", packages=find_packages(), ' + f'version="{value}")\n' ) # test a package with an underscore in the name