Skip to content

Commit

Permalink
Merge branch 'hotfix/2.0.20'
Browse files Browse the repository at this point in the history
  • Loading branch information
Limych committed Oct 5, 2020
2 parents b3005c4 + f5d6096 commit 66ef68e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
ROOT="$( cd "$( dirname "$(readlink -f "$0")" )/.." >/dev/null 2>&1 && pwd )"

cd "${ROOT}"
script/bootstrap
bin/bootstrap

pre-commit install
pip3 install -r requirements-dev.txt
Expand Down
6 changes: 5 additions & 1 deletion custom_components/gismeteo/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
TEMP_CELSIUS,
SPEED_METERS_PER_SECOND,
DEGREE,
PERCENTAGE,
PRESSURE_HPA,
)

try:
from homeassistant.const import PERCENTAGE
except ImportError:
from homeassistant.const import UNIT_PERCENTAGE as PERCENTAGE

BASE_URL = "https://services.gismeteo.ru/inform-service/inf_chrome"

MMHG2HPA = 1.333223684
Expand Down
18 changes: 9 additions & 9 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
-r requirements.txt
black
flake8
mypy
black==20.08b1
flake8~=3.8
mypy==0.782
packaging~=20.4
pre-commit
PyGithub==1.53
pylint
pylint-strict-informational
pyupgrade
yamllint
pre-commit~=2.7
PyGithub~=1.53
pylint~=2.6
pylint-strict-informational==0.1
pyupgrade~=2.7
yamllint~=1.25
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
geopy
geohash2
voluptuous
homeassistant
geopy~=2.0
geohash2~=1.1
voluptuous~=0.12
homeassistant~=0.115

0 comments on commit 66ef68e

Please sign in to comment.