alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'distutils' into 'master'

Browse Source 
fix(tools): remove distutils to support python 3.12

Closes IDFGH-13510

See merge request espressif/esp-idf!33260
This commit is contained in:
Roland Dobai 2024-09-06 14:23:04 +08:00
commit 17fed13a27
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/idf_py_actions/create_ext.py
View File

@ -1,11 +1,10 @@
# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
from __future__ import print_function
import os import os
import re import re
import sys import sys
from distutils.dir_util import copy_tree from shutil import copy
from shutil import copytree
from typing import Dict from typing import Dict
import click import click
@ -40,10 +39,11 @@ def is_empty_and_create(path: str, action: str) -> None:
def create_project(target_path: str, name: str) -> None: def create_project(target_path: str, name: str) -> None:
copy_tree( copytree(
os.path.join(os.environ['IDF_PATH'], 'examples', 'get-started', 'sample_project'), os.path.join(os.environ['IDF_PATH'], 'examples', 'get-started', 'sample_project'),
target_path, target_path,
preserve_mode=0, copy_function=copy,
dirs_exist_ok=True,
) )
main_folder = os.path.join(target_path, 'main') main_folder = os.path.join(target_path, 'main')
os.rename(os.path.join(main_folder, 'main.c'), os.path.join(main_folder, '.'.join((name, 'c')))) os.rename(os.path.join(main_folder, 'main.c'), os.path.join(main_folder, '.'.join((name, 'c'))))
@ -53,10 +53,11 @@ def create_project(target_path: str, name: str) -> None:
def create_component(target_path: str, name: str) -> None: def create_component(target_path: str, name: str) -> None:
copy_tree( copytree(
os.path.join(os.environ['IDF_PATH'], 'tools', 'templates', 'sample_component'), os.path.join(os.environ['IDF_PATH'], 'tools', 'templates', 'sample_component'),
target_path, target_path,
preserve_mode=0, copy_function=copy,
dirs_exist_ok=True,
) )
os.rename(os.path.join(target_path, 'main.c'), os.path.join(target_path, '.'.join((name, 'c')))) os.rename(os.path.join(target_path, 'main.c'), os.path.join(target_path, '.'.join((name, 'c'))))
os.rename(os.path.join(target_path, 'include', 'main.h'), os.rename(os.path.join(target_path, 'include', 'main.h'),

4
tools/mass_mfg/mfg_gen.py
View File

@ -7,8 +7,8 @@ import argparse
import csv import csv
import os import os
from itertools import zip_longest from itertools import zip_longest
from pathlib import Path
import distutils.dir_util
import esp_idf_nvs_partition_gen.nvs_partition_gen as nvs_partition_gen import esp_idf_nvs_partition_gen.nvs_partition_gen as nvs_partition_gen
@ -208,7 +208,7 @@ def create_dir(filetype, output_dir_path):
""" """
output_target_dir = os.path.join(output_dir_path,filetype,'') output_target_dir = os.path.join(output_dir_path,filetype,'')
if not os.path.isdir(output_target_dir): if not os.path.isdir(output_target_dir):
distutils.dir_util.mkpath(output_target_dir) Path(output_target_dir).mkdir(parents=True)
return output_target_dir return output_target_dir