Skip to content

Commit

Permalink
Bump pydantic to 2.10.2 and update required deps
Browse files Browse the repository at this point in the history
fixes #99218
  • Loading branch information
bdraco committed Nov 30, 2024
1 parent 6da2515 commit 13fd1d5
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 39 deletions.
27 changes: 0 additions & 27 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,33 +197,6 @@ jobs:
split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all_wheels_${{ matrix.arch }}.txt requirements_all.txt
- name: Create requirements for cython<3
if: matrix.abi == 'cp312'
run: |
# Some dependencies still require 'cython<3'
# and don't yet use isolated build environments.
# Build these first.
# pydantic: https://github.com/pydantic/pydantic/issues/7689
touch requirements_old-cython.txt
cat homeassistant/package_constraints.txt | grep 'pydantic==' >> requirements_old-cython.txt
- name: Build wheels (old cython)
uses: home-assistant/[email protected]
if: matrix.abi == 'cp312'
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
arch: ${{ matrix.arch }}
wheels-key: ${{ secrets.WHEELS_KEY }}
env-file: true
apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pydantic;pymicro-vad;yarl
constraints: "homeassistant/package_constraints.txt"
requirements-diff: "requirements_diff.txt"
requirements: "requirements_old-cython.txt"
pip: "'cython<3'"

- name: Build wheels (part 1)
uses: home-assistant/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/aussie_broadband/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/aussie_broadband",
"iot_class": "cloud_polling",
"loggers": ["aussiebb"],
"requirements": ["pyaussiebb==0.0.15"]
"requirements": ["pyaussiebb==0.1.4"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/purpleair/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/purpleair",
"iot_class": "cloud_polling",
"requirements": ["aiopurpleair==2022.12.1"]
"requirements": ["aiopurpleair==2023.12.0"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/xbox/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"dependencies": ["auth", "application_credentials"],
"documentation": "https://www.home-assistant.io/integrations/xbox",
"iot_class": "cloud_polling",
"requirements": ["xbox-webapi==2.0.11"]
"requirements": ["xbox-webapi==2.1.0"]
}
2 changes: 1 addition & 1 deletion homeassistant/package_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ backoff>=2.0

# Required to avoid breaking (#101042).
# v2 has breaking changes (#99218).
pydantic==1.10.19
pydantic==2.10.2

# Required for Python 3.12.4 compatibility (#119223).
mashumaro>=3.13.1
Expand Down
6 changes: 3 additions & 3 deletions requirements_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ aiopegelonline==0.1.0
aiopulse==0.4.6

# homeassistant.components.purpleair
aiopurpleair==2022.12.1
aiopurpleair==2023.12.0

# homeassistant.components.hunterdouglas_powerview
aiopvapi==3.1.1
Expand Down Expand Up @@ -1781,7 +1781,7 @@ pyatmo==8.1.0
pyatv==0.16.0

# homeassistant.components.aussie_broadband
pyaussiebb==0.0.15
pyaussiebb==0.1.4

# homeassistant.components.balboa
pybalboa==1.0.2
Expand Down Expand Up @@ -3017,7 +3017,7 @@ wolf-comm==0.0.15
wyoming==1.5.4

# homeassistant.components.xbox
xbox-webapi==2.0.11
xbox-webapi==2.1.0

# homeassistant.components.xiaomi_ble
xiaomi-ble==0.33.0
Expand Down
2 changes: 1 addition & 1 deletion requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ license-expression==30.4.0
mock-open==1.4.0
mypy-dev==1.14.0a3
pre-commit==4.0.0
pydantic==1.10.19
pydantic==2.10.2
pylint==3.3.1
pylint-per-file-ignores==1.3.2
pipdeptree==2.23.4
Expand Down
6 changes: 3 additions & 3 deletions requirements_test_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ aiopegelonline==0.1.0
aiopulse==0.4.6

# homeassistant.components.purpleair
aiopurpleair==2022.12.1
aiopurpleair==2023.12.0

# homeassistant.components.hunterdouglas_powerview
aiopvapi==3.1.1
Expand Down Expand Up @@ -1455,7 +1455,7 @@ pyatmo==8.1.0
pyatv==0.16.0

# homeassistant.components.aussie_broadband
pyaussiebb==0.0.15
pyaussiebb==0.1.4

# homeassistant.components.balboa
pybalboa==1.0.2
Expand Down Expand Up @@ -2412,7 +2412,7 @@ wolf-comm==0.0.15
wyoming==1.5.4

# homeassistant.components.xbox
xbox-webapi==2.0.11
xbox-webapi==2.1.0

# homeassistant.components.xiaomi_ble
xiaomi-ble==0.33.0
Expand Down
2 changes: 1 addition & 1 deletion script/gen_requirements_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
# Required to avoid breaking (#101042).
# v2 has breaking changes (#99218).
pydantic==1.10.19
pydantic==2.10.2
# Required for Python 3.12.4 compatibility (#119223).
mashumaro>=3.13.1
Expand Down

0 comments on commit 13fd1d5

Please sign in to comment.