Fix dependencies

Evgeny PisemskySat Jan 25 17:40:47+0300 2025

ac5fda8

Fix dependencies

modules/homeassistant-package.scm

2929 
3030 
;;; Dependencies for empty configuration
3131 
32-
(define-public python-aiohttp-for-homeassistant
33-
  (package
34-
    (inherit python-aiohttp)
35-
    (version "3.8.5")
36-
    (source
37-
     (origin
38-
       (method url-fetch)
39-
       (uri (pypi-uri "aiohttp" version))
40-
       (sha256
41-
        (base32 "1g6hqz8w18sc37npdl6wl8gfa0knmycarisajkqxniy15k2jwmdr"))))))
42-
4332 
(define-public python-astral-for-homeassistant
4433 
  (package
4534 
    (inherit python-astral)
…
531520 
    (description "Convert voluptuous schemas to dictionaries.")
532521 
    (license license:asl2.0)))
533522 
534-
(define-public python-yarl-for-homeassistant
535-
  (package
536-
    (inherit python-yarl)
537-
    (version "1.9.2")
538-
    (source
539-
     (origin
540-
       (method url-fetch)
541-
       (uri (pypi-uri "yarl" version))
542-
       (sha256
543-
        (base32 "0w9mh8851i7chig0vab5djcxyz5p2y9zxay207c0cz2qkx5rvaq4"))))))
544-
545523 
;;; Dependencies from homeassistant/package_constraints.txt
546524 
547525 
(define-public python-aiohttp-cors
…
557535 
    (build-system pyproject-build-system)
558536 
    (arguments (list #:tests? #f))
559537 
    (native-inputs (list python-setuptools python-wheel))
560-
    (propagated-inputs (list python-aiohttp-for-homeassistant))
538+
    (propagated-inputs (list python-aiohttp))
561539 
    (home-page "https://github.com/aio-libs/aiohttp-cors")
562540 
    (synopsis "CORS support for aiohttp")
563541 
    (description "CORS support for aiohttp.")
…
612590 
       (sha256
613591 
        (base32 "1fa0lm90sibdzwi0hk5b47k68fhjpvh68vgg287ffsxl7sq34ki2"))))
614592 
    (build-system pyproject-build-system)
615-
    (native-inputs (list python-poetry-core))))
593+
    (arguments (list #:tests? #f))
594+
    (native-inputs (list python-poetry-core python-setuptools))))
616595 
617596 
(define-public python-aiodiscover
618597 
  (package
…
694673 
      #:phases #~(modify-phases %standard-phases
695674 
                   (delete 'sanity-check))))
696675 
    (native-inputs (list python-setuptools python-wheel))
697-
    (propagated-inputs (list python-aiohttp-for-homeassistant
676+
    (propagated-inputs (list python-aiohttp
698677 
                             python-async-timeout
699678 
                             python-defusedxml
700679 
                             python-didl-lite
…
793772 
    (license license:asl2.0)))
794773 
795774 
(define-public python-pycognito
796-
  ((options->transformation '((without-tests . "python-jose")))
797-
   (package
798-
     (name "python-pycognito")
799-
     (version "2022.12.0")
800-
     (source
801-
      (origin
802-
        (method url-fetch)
803-
        (uri (pypi-uri "pycognito" version))
804-
        (sha256
805-
         (base32 "0byr2daq3xggddafgliv5k8psbx1swrkd476wwp98qiq1x10gk29"))))
806-
     (build-system pyproject-build-system)
807-
     (arguments (list #:tests? #f))
808-
     (native-inputs (list python-setuptools python-wheel))
809-
     (propagated-inputs (list python-boto3
810-
                              python-envs
811-
                              python-jose
812-
                              python-requests-for-homeassistant))
813-
     (home-page "https://github.com/pvizeli/pycognito")
814-
     (synopsis
815-
      "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support.")
816-
     (description
817-
      "Python class to integrate Boto3's Cognito client so it is easy to login users.
818-
With SRP support.")
819-
     (license license:asl2.0))))
775+
  (package
776+
    (name "python-pycognito")
777+
    (version "2022.12.0")
778+
    (source
779+
     (origin
780+
       (method url-fetch)
781+
       (uri (pypi-uri "pycognito" version))
782+
       (sha256
783+
        (base32 "0byr2daq3xggddafgliv5k8psbx1swrkd476wwp98qiq1x10gk29"))))
784+
    (build-system pyproject-build-system)
785+
    (arguments (list #:tests? #f))
786+
    (native-inputs (list python-setuptools python-wheel))
787+
    (propagated-inputs (list python-boto3
788+
                             python-envs
789+
                             python-jose
790+
                             python-requests-for-homeassistant))
791+
    (home-page "https://github.com/pvizeli/pycognito")
792+
    (synopsis
793+
     "Python class to integrate Boto3's Cognito client so it is easy to
794+
login users. With SRP support.")
795+
    (description
796+
     "Python class to integrate Boto3's Cognito client so it is easy to
797+
login users. With SRP support.")
798+
    (license license:asl2.0)))
820799 
821800 
(define-public python-snitun
822801 
  (package
…
830809 
        (base32 "0kyqzghh273fy81jrxqgzl0qj8wnn11iz7ay5396hg67ap6blcnb"))))
831810 
    (build-system pyproject-build-system)
832811 
    (arguments (list #:tests? #f))
833-
    (propagated-inputs (list python-aiohttp-for-homeassistant
812+
    (propagated-inputs (list python-aiohttp
834813 
                             python-async-timeout
835814 
                             python-attrs-for-homeassistant
836815 
                             python-cryptography))
…
858837 
    (arguments (list #:tests? #f))
859838 
    (native-inputs (list python-wheel))
860839 
    (propagated-inputs (list python-acme
861-
                             python-aiohttp-for-homeassistant
840+
                             python-aiohttp
862841 
                             python-atomicwrites-homeassistant
863842 
                             python-attrs-for-homeassistant
864843 
                             python-ciso8601-for-homeassistant
…
1014993 
    (native-inputs (list python-poetry-core python-setuptools))
1015994 
    (propagated-inputs (list python-async-timeout python-ifaddr-for-homeassistant))))
1016995 
1017-
(define-public python-sqlalchemy-for-homeassistant
1018-
  (package
1019-
    (inherit python-sqlalchemy-2)
1020-
    (version "2.0.15")
1021-
    (source
1022-
     (origin
1023-
       (method url-fetch)
1024-
       (uri (pypi-uri "SQLAlchemy" version))
1025-
       (sha256
1026-
        (base32 "1g4vpv2fijdg69vhsz8zx7v0zpxdb9njm7hd1vhhm1zgb630m51f"))))
1027-
    (native-inputs (modify-inputs (package-native-inputs python-sqlalchemy-2)
1028-
                     (append python-wheel)))))
996+
;; (define-public python-sqlalchemy-for-homeassistant
997+
;;   (package
998+
;;     (inherit python-sqlalchemy-2)
999+
;;     (version "2.0.15")
1000+
;;     (source
1001+
;;      (origin
1002+
;;        (method url-fetch)
1003+
;;        (uri (pypi-uri "SQLAlchemy" version))
1004+
;;        (sha256
1005+
;;         (base32 "1g4vpv2fijdg69vhsz8zx7v0zpxdb9njm7hd1vhhm1zgb630m51f"))))
1006+
;;     (native-inputs (modify-inputs (package-native-inputs python-sqlalchemy-2)
1007+
;;                      (append python-wheel)))))
10291008 
10301009 
;;; Dependencies for default configuration
10311010 
…
10421021 
    (build-system pyproject-build-system)
10431022 
    (arguments (list #:tests? #f))
10441023 
    (native-inputs (list python-setuptools python-wheel))
1045-
    (propagated-inputs (list python-aiohttp-for-homeassistant
1024+
    (propagated-inputs (list python-aiohttp
10461025 
                             python-async-timeout
10471026 
                             python-xmltodict python-pytz))
10481027 
    (home-page "https://github.com/Danielhiversen/pyMetno/")
…
11011080 
    (arguments (list #:tests? #f))
11021081 
    (native-inputs (list python-poetry-core python-setuptools))
11031082 
    (propagated-inputs (list python-aiodns
1104-
                             python-aiohttp-for-homeassistant
1083+
                             python-aiohttp
11051084 
                             python-awesomeversion
11061085 
                             python-backoff
11071086 
                             python-cachetools
11081087 
                             python-mashumaro
11091088 
                             python-orjson
11101089 
                             python-pycountry
1111-
                             python-yarl-for-homeassistant
1090+
                             python-yarl
11121091 
                             python-pydantic))
11131092 
    (home-page "https://github.com/frenck/python-radios")
11141093 
    (synopsis "Asynchronous Python client for the Radio Browser API")
…
11531132 
          (add-after 'unpack 'relax-dependencies
11541133 
            (lambda _
11551134 
              (substitute* "pyproject.toml"
1135+
                (("aiohttp==3.8.5")
1136+
                 "aiohttp>=3.8.5,<4")
11561137 
                (("bcrypt==4.0.1")
11571138 
                 "bcrypt>3")
11581139 
                (("cryptography==41.0.1")
…
11641145 
                (("async-timeout==4.0.2")
11651146 
                 "async-timeout>=4.0.2")
11661147 
                (("httpx==0.24.1")
1167-
                 "httpx>=0.24.1")))))))
1168-
    (propagated-inputs (list python-aiohttp-for-homeassistant    ; aiohttp==3.8.5
1148+
                 "httpx>=0.24.1")
1149+
                (("yarl==1.9.2")
1150+
                 "yarl>=1.9.2,<2")))))))
1151+
    (propagated-inputs (list python-aiohttp                      ; aiohttp==3.8.5 (relaxed)
11691152 
                             python-astral-for-homeassistant     ; astral==2.2
11701153 
                             python-async-timeout                ; async-timeout==4.0.2 (relaxed)
11711154 
                             python-attrs-for-homeassistant      ; attrs==22.2.0
…
11911174 
                             python-ulid-transform               ; ulid-transform==0.7.2
11921175 
                             python-voluptuous-for-homeassistant ; voluptuous==0.13.1
11931176 
                             python-voluptuous-serialize         ; voluptuous-serialize==2.6.0
1194-
                             python-yarl-for-homeassistant       ; yarl==1.9.2
1177+
                             python-yarl                         ; yarl==1.9.2 (relaxed)
11951178 
11961179 
                             python-aiohttp-cors               ; aiohttp-cors==0.7.0
11971180 
                             python-aiodiscover                ; aiodiscover==1.4.16
1198-
                             python-sqlalchemy-for-homeassistant ; SQLAlchemy==2.0.15
1181+
                             python-sqlalchemy-2               ; SQLAlchemy==2.0.15
11991182 
                             python-home-assistant-intents     ; home-assistant-intents==2023.6.28
12001183 
                             python-async-upnp-client          ; async-upnp-client==0.33.2
12011184 
                             python-fnv-hash-fast              ; fnv-hash-fast==0.3.1