From 8eb75074824def45d5029e65e192fe203b6a3e3f Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Tue, 22 Feb 2022 14:32:55 +0100 Subject: [PATCH] Cleanup after setup.py removal (#67036) --- .core_files.yaml | 2 +- .github/workflows/wheels.yml | 2 +- CODEOWNERS | 2 +- script/gen_requirements_all.py | 2 +- script/hassfest/codeowners.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.core_files.yaml b/.core_files.yaml index 2b9f1563d99..ebc3ff376f8 100644 --- a/.core_files.yaml +++ b/.core_files.yaml @@ -128,7 +128,7 @@ requirements: &requirements - .github/workflows/* - homeassistant/package_constraints.txt - requirements*.txt - - setup.py + - setup.cfg any: - *base_platforms diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a60ac651e31..a0d6396ec30 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -44,7 +44,7 @@ jobs: echo "GRPC_PYTHON_BUILD_WITH_CYTHON=true" echo "GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=true" # GRPC on armv7 needs -lexecinfo (issue #56669) since home assistant installs - # execinfo-dev when building wheels. The setup.py does not have an option for + # execinfo-dev when building wheels. The setuptools build setup does not have an option for # adding a single LDFLAG so copy all relevant linux flags here (as of 1.43.0) echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc -lexecinfo" ) > .env_file diff --git a/CODEOWNERS b/CODEOWNERS index 075c8abbc65..283bd6442b1 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -4,7 +4,7 @@ # https://github.com/blog/2392-introducing-code-owners # Home Assistant Core -setup.py @home-assistant/core +setup.cfg @home-assistant/core homeassistant/*.py @home-assistant/core homeassistant/helpers/* @home-assistant/core homeassistant/util/* @home-assistant/core diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index 95a5999aaf1..1e3f39a2f89 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -168,7 +168,7 @@ def explore_module(package, explore_children): def core_requirements(): - """Gather core requirements out of setup.py.""" + """Gather core requirements out of setup.cfg.""" parser = configparser.ConfigParser() parser.read("setup.cfg") return parser["options"]["install_requires"].strip().split("\n") diff --git a/script/hassfest/codeowners.py b/script/hassfest/codeowners.py index 91bd81efef5..cf8fb02b989 100644 --- a/script/hassfest/codeowners.py +++ b/script/hassfest/codeowners.py @@ -10,7 +10,7 @@ BASE = """ # https://github.com/blog/2392-introducing-code-owners # Home Assistant Core -setup.py @home-assistant/core +setup.cfg @home-assistant/core homeassistant/*.py @home-assistant/core homeassistant/helpers/* @home-assistant/core homeassistant/util/* @home-assistant/core