mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
home-assistant: find unstable versions in parse-requirements.py
Previously unstable versions would not have been found, because the regular expression was looking for a numeric version after the attribute name. When the version is however an unstable one, it would start with > unstable-2021-04-23 and therefore not match the pattern.
This commit is contained in:
parent
313681c8fc
commit
f129df86a1
|
@ -90,7 +90,7 @@
|
||||||
"blueprint" = ps: with ps; [ ];
|
"blueprint" = ps: with ps; [ ];
|
||||||
"bluesound" = ps: with ps; [ xmltodict ];
|
"bluesound" = ps: with ps; [ xmltodict ];
|
||||||
"bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
|
"bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
|
||||||
"bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez
|
"bluetooth_tracker" = ps: with ps; [ bt_proximity pybluez ];
|
||||||
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
|
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
|
||||||
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
|
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
|
||||||
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
|
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
|
||||||
|
|
|
@ -124,7 +124,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional
|
||||||
for name in names:
|
for name in names:
|
||||||
# treat "-" and "_" equally
|
# treat "-" and "_" equally
|
||||||
name = re.sub("[-_]", "[-_]", name)
|
name = re.sub("[-_]", "[-_]", name)
|
||||||
pattern = re.compile("^python\\d\\.\\d-{}-\\d".format(name), re.I)
|
# python(minor).(major)-(pname)-(version or unstable-date)
|
||||||
|
# we need the version qualifier, or we'll have multiple matches
|
||||||
|
# (e.g. pyserial and pyserial-asyncio when looking for pyserial)
|
||||||
|
pattern = re.compile("^python\\d\\.\\d-{}-(?:\\d|unstable-.*)".format(name), re.I)
|
||||||
for attr_path, package in packages.items():
|
for attr_path, package in packages.items():
|
||||||
if pattern.match(package["name"]):
|
if pattern.match(package["name"]):
|
||||||
attr_paths.add(attr_path)
|
attr_paths.add(attr_path)
|
||||||
|
|
Loading…
Reference in a new issue