From f5975d4039760c0fadb194fdd3c65a444b3ceaf8 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Mon, 26 Jun 2023 19:03:56 +0200 Subject: [PATCH] Update build system (#95237) --- .github/workflows/ci.yaml | 4 ++-- homeassistant/package_constraints.txt | 2 +- pyproject.toml | 6 ++++-- requirements.txt | 2 +- script/setup | 2 +- setup.cfg | 5 ----- 6 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 setup.cfg diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3ab93b7128efa7..bfc4be56077c19 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -492,10 +492,10 @@ jobs: python -m venv venv . venv/bin/activate python --version - pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<23.2" setuptools wheel + pip install --cache-dir=$PIP_CACHE -U "pip>=21.3.1,<23.2" setuptools wheel pip install --cache-dir=$PIP_CACHE -r requirements_all.txt pip install --cache-dir=$PIP_CACHE -r requirements_test.txt - pip install -e . + pip install . hassfest: name: Check hassfest diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 4f97ec243c03f2..ba9145b18f6359 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -33,7 +33,7 @@ mutagen==1.46.0 orjson==3.9.1 paho-mqtt==1.6.1 Pillow==9.5.0 -pip>=21.0,<23.2 +pip>=21.3.1,<23.2 psutil-home-assistant==0.0.1 PyJWT==2.7.0 PyNaCl==1.5.0 diff --git a/pyproject.toml b/pyproject.toml index bea8a1696fa8a0..ff238d97b69bc2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools~=62.3", "wheel~=0.37.1"] +requires = ["setuptools~=68.0", "wheel~=0.40.0"] build-backend = "setuptools.build_meta" [project] @@ -19,6 +19,7 @@ classifiers = [ "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Topic :: Home Automation", ] requires-python = ">=3.10.0" @@ -45,7 +46,7 @@ dependencies = [ # pyOpenSSL 23.2.0 is required to work with cryptography 41+ "pyOpenSSL==23.2.0", "orjson==3.9.1", - "pip>=21.0,<23.2", + "pip>=21.3.1,<23.2", "python-slugify==4.0.1", "PyYAML==6.0", "requests==2.31.0", @@ -57,6 +58,7 @@ dependencies = [ ] [project.urls] +"Homepage" = "https://www.home-assistant.io/" "Source Code" = "https://github.com/home-assistant/core" "Bug Reports" = "https://github.com/home-assistant/core/issues" "Docs: Dev" = "https://developers.home-assistant.io/" diff --git a/requirements.txt b/requirements.txt index cf86475098f18e..f4f2608b597200 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ PyJWT==2.7.0 cryptography==41.0.1 pyOpenSSL==23.2.0 orjson==3.9.1 -pip>=21.0,<23.2 +pip>=21.3.1,<23.2 python-slugify==4.0.1 PyYAML==6.0 requests==2.31.0 diff --git a/script/setup b/script/setup index e68ec72cbbae05..a5c2d48b2b3d25 100755 --- a/script/setup +++ b/script/setup @@ -24,7 +24,7 @@ fi script/bootstrap pre-commit install -python3 -m pip install -e . --constraint homeassistant/package_constraints.txt +python3 -m pip install -e . --config-settings editable_mode=compat --constraint homeassistant/package_constraints.txt python3 -m script.translations develop --all hass --script ensure_config -c config diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 29713b6df46cac..00000000000000 --- a/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# Setuptools v62.3 doesn't support editable installs with just 'pyproject.toml' (PEP 660). -# Keep this file until it does! - -[metadata] -url = https://www.home-assistant.io/