Skip to content

Commit 3dc63bc

Browse files
authored
Merge pull request #14 from scs/feature/update
Feature/update
2 parents 1aaedd5 + 1514761 commit 3dc63bc

File tree

11 files changed

+2353
-2262
lines changed

11 files changed

+2353
-2262
lines changed

backend/Pipfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ verify_ssl = true
44
name = "pypi"
55

66
[packages]
7-
starlette = "~=0.27.0"
8-
uvicorn = "~=0.22.0"
7+
starlette = "~=0.37.2"
8+
uvicorn = "~=0.29.0"
99
pydantic = "~=1.10.7"
1010

1111
[dev-packages]
1212
autopep8 = "*"
1313
chardet = "*"
1414
isort = "*"
1515
pipenv-setup = "*"
16+
plette = "~=0.4"
1617
pylint = "*"
1718
pytest = "*"
1819
setuptools = "*"

backend/Pipfile.lock

Lines changed: 406 additions & 491 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
smartmeter-datacollector-configurator (1.2.0-1) unstable; urgency=low
2+
3+
* add L+G E570 meter
4+
* update frontend & backend dependencies
5+
6+
-- Supercomputing Systems AG <info@scs.ch> Wed, 27 Mar 2024 13:10:32 +0100
7+
18
smartmeter-datacollector-configurator (1.1.0-1) unstable; urgency=low
29

310
* add L+G E360 meter

backend/debian/postinst

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ set -e
99
echo -n "Installing dependencies using pip.."
1010
# write a pip requirements.txt for automatic dependency installation
1111
echo "-i https://pypi.org/simple
12-
anyio==3.6.2 ; python_full_version >= '3.6.2'
13-
click==8.1.3 ; python_version >= '3.7'
12+
anyio==4.3.0 ; python_version >= '3.8'
13+
click==8.1.7 ; python_version >= '3.7'
14+
exceptiongroup==1.2.0 ; python_version < '3.11'
1415
h11==0.14.0 ; python_version >= '3.7'
15-
idna==3.4 ; python_version >= '3.5'
16-
pydantic==1.10.7
17-
sniffio==1.3.0 ; python_version >= '3.7'
18-
starlette==0.27.0
19-
typing-extensions==4.5.0 ; python_version >= '3.7'
20-
uvicorn==0.22.0" > /tmp/requirements.txt
16+
idna==3.6 ; python_version >= '3.5'
17+
pydantic==1.10.14
18+
sniffio==1.3.1 ; python_version >= '3.7'
19+
starlette==0.37.2
20+
typing-extensions==4.10.0 ; python_version >= '3.8'
21+
uvicorn==0.29.0" > /tmp/requirements.txt
2122
# install all required dependencies
2223
python3 -m pip install -r /tmp/requirements.txt > /dev/null 2>&1
2324
rm /tmp/requirements.txt

backend/setup.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@
4545
),
4646
include_package_data=True,
4747
install_requires=[
48-
"anyio==3.6.2; python_full_version >= '3.6.2'",
49-
"click==8.1.3; python_version >= '3.7'",
48+
"anyio==4.3.0; python_version >= '3.8'",
49+
"click==8.1.7; python_version >= '3.7'",
50+
"exceptiongroup==1.2.0; python_version < '3.11'",
5051
"h11==0.14.0; python_version >= '3.7'",
51-
"idna==3.4; python_version >= '3.5'",
52-
'pydantic==1.10.7',
53-
"sniffio==1.3.0; python_version >= '3.7'",
54-
'starlette==0.27.0',
55-
"typing-extensions==4.5.0; python_version >= '3.7'",
56-
'uvicorn==0.22.0'
52+
"idna==3.6; python_version >= '3.5'",
53+
'pydantic==1.10.14',
54+
"sniffio==1.3.1; python_version >= '3.7'",
55+
'starlette==0.37.2',
56+
"typing-extensions==4.10.0; python_version >= '3.8'",
57+
'uvicorn==0.29.0'
5758
],
5859
scripts=["bin/smartmeter-datacollector-configurator"],
5960
zip_safe=True,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.1.0"
1+
__version__ = "1.2.0"

backend/smartmeter_datacollector_configurator/dto.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
class MeterType(str, Enum):
1212
LGE450 = "lge450"
1313
LGE360 = "lge360"
14+
LGE570 = "lge570"
1415
ISKRAAM550 = "iskraam550"
1516
KAMSTRUP_HAN = "kamstrup_han"
1617

frontend/smartmeter-datacollector-configurator/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Install latest LTS [nodejs (version 16.x.x)](https://nodejs.org/en/) which also
1515

1616
Setup the project running
1717
```
18-
npm install --dev
18+
npm install --include=dev
1919
```
2020
inside the `frontend/smartmeter-datacollector-configurator` directory.
2121

0 commit comments

Comments
 (0)