From 69a7a71dcdbba868157f0c57d1472bbdf5d90dde Mon Sep 17 00:00:00 2001 From: Stefan Hellander Date: Wed, 5 Jun 2024 15:11:08 +0200 Subject: [PATCH] Updated versions in pyproject.toml and removed use of distutils. --- fedn/network/clients/client.py | 10 ++++++---- pyproject.toml | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fedn/network/clients/client.py b/fedn/network/clients/client.py index 14b95a906..c0f1b0baa 100644 --- a/fedn/network/clients/client.py +++ b/fedn/network/clients/client.py @@ -10,8 +10,8 @@ import time import uuid from datetime import datetime -from distutils.dir_util import copy_tree from io import BytesIO +from shutil import copytree import grpc from cryptography.hazmat.primitives.serialization import Encoding @@ -22,11 +22,13 @@ import fedn.network.grpc.fedn_pb2 as fedn import fedn.network.grpc.fedn_pb2_grpc as rpc from fedn.common.config import FEDN_AUTH_SCHEME, FEDN_PACKAGE_EXTRACT_DIR -from fedn.common.log_config import logger, set_log_level_from_string, set_log_stream +from fedn.common.log_config import (logger, set_log_level_from_string, + set_log_stream) from fedn.network.clients.connect import ConnectorClient, Status from fedn.network.clients.package import PackageRuntime from fedn.network.clients.state import ClientState, ClientStateToString -from fedn.network.combiner.modelservice import get_tmp_path, upload_request_generator +from fedn.network.combiner.modelservice import (get_tmp_path, + upload_request_generator) from fedn.utils.dispatcher import Dispatcher from fedn.utils.helpers.helpers import get_helper @@ -340,7 +342,7 @@ def _initialize_dispatcher(self, config): } from_path = os.path.join(os.getcwd(), "client") - copy_tree(from_path, self.run_path) + copytree(from_path, self.run_path) self.dispatcher = Dispatcher(dispatch_config, self.run_path) # Get or create python environment activate_cmd = self.dispatcher._get_or_create_python_env() diff --git a/pyproject.toml b/pyproject.toml index d52b57269..a6fc87dcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,9 +24,10 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] -requires-python = '>=3.8,<3.12' +requires-python = '>=3.8,<3.13' dependencies = [ "requests", "urllib3>=1.26.4",