From 2c159021956745efa8c9b332650f441450653a74 Mon Sep 17 00:00:00 2001 From: crusaderky Date: Tue, 29 Mar 2022 11:45:29 +0100 Subject: [PATCH] Drop runtime dependency to setuptools --- .pre-commit-config.yaml | 1 - continuous_integration/recipes/dask/meta.yaml | 1 + continuous_integration/recipes/distributed/meta.yaml | 5 +++-- distributed/tests/test_client.py | 7 ++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7197c0b308..6276fe1c17 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 90c6929512..01746b7b51 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 0353bdf4c7..8d8011b5a4 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 7b41900032..7479b8cff4 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