Skip to content

Commit

Permalink
Merge pull request #14 from scs/feature/update
Browse files Browse the repository at this point in the history
Feature/update
  • Loading branch information
raymar9 authored Mar 27, 2024
2 parents 1aaedd5 + 1514761 commit 3dc63bc
Show file tree
Hide file tree
Showing 11 changed files with 2,353 additions and 2,262 deletions.
5 changes: 3 additions & 2 deletions backend/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ verify_ssl = true
name = "pypi"

[packages]
starlette = "~=0.27.0"
uvicorn = "~=0.22.0"
starlette = "~=0.37.2"
uvicorn = "~=0.29.0"
pydantic = "~=1.10.7"

[dev-packages]
autopep8 = "*"
chardet = "*"
isort = "*"
pipenv-setup = "*"
plette = "~=0.4"
pylint = "*"
pytest = "*"
setuptools = "*"
Expand Down
897 changes: 406 additions & 491 deletions backend/Pipfile.lock

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions backend/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
smartmeter-datacollector-configurator (1.2.0-1) unstable; urgency=low

* add L+G E570 meter
* update frontend & backend dependencies

-- Supercomputing Systems AG <[email protected]> Wed, 27 Mar 2024 13:10:32 +0100

smartmeter-datacollector-configurator (1.1.0-1) unstable; urgency=low

* add L+G E360 meter
Expand Down
17 changes: 9 additions & 8 deletions backend/debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ set -e
echo -n "Installing dependencies using pip.."
# write a pip requirements.txt for automatic dependency installation
echo "-i https://pypi.org/simple
anyio==3.6.2 ; python_full_version >= '3.6.2'
click==8.1.3 ; python_version >= '3.7'
anyio==4.3.0 ; python_version >= '3.8'
click==8.1.7 ; python_version >= '3.7'
exceptiongroup==1.2.0 ; python_version < '3.11'
h11==0.14.0 ; python_version >= '3.7'
idna==3.4 ; python_version >= '3.5'
pydantic==1.10.7
sniffio==1.3.0 ; python_version >= '3.7'
starlette==0.27.0
typing-extensions==4.5.0 ; python_version >= '3.7'
uvicorn==0.22.0" > /tmp/requirements.txt
idna==3.6 ; python_version >= '3.5'
pydantic==1.10.14
sniffio==1.3.1 ; python_version >= '3.7'
starlette==0.37.2
typing-extensions==4.10.0 ; python_version >= '3.8'
uvicorn==0.29.0" > /tmp/requirements.txt
# install all required dependencies
python3 -m pip install -r /tmp/requirements.txt > /dev/null 2>&1
rm /tmp/requirements.txt
Expand Down
17 changes: 9 additions & 8 deletions backend/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@
),
include_package_data=True,
install_requires=[
"anyio==3.6.2; python_full_version >= '3.6.2'",
"click==8.1.3; python_version >= '3.7'",
"anyio==4.3.0; python_version >= '3.8'",
"click==8.1.7; python_version >= '3.7'",
"exceptiongroup==1.2.0; python_version < '3.11'",
"h11==0.14.0; python_version >= '3.7'",
"idna==3.4; python_version >= '3.5'",
'pydantic==1.10.7',
"sniffio==1.3.0; python_version >= '3.7'",
'starlette==0.27.0',
"typing-extensions==4.5.0; python_version >= '3.7'",
'uvicorn==0.22.0'
"idna==3.6; python_version >= '3.5'",
'pydantic==1.10.14',
"sniffio==1.3.1; python_version >= '3.7'",
'starlette==0.37.2',
"typing-extensions==4.10.0; python_version >= '3.8'",
'uvicorn==0.29.0'
],
scripts=["bin/smartmeter-datacollector-configurator"],
zip_safe=True,
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.1.0"
__version__ = "1.2.0"
1 change: 1 addition & 0 deletions backend/smartmeter_datacollector_configurator/dto.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
class MeterType(str, Enum):
LGE450 = "lge450"
LGE360 = "lge360"
LGE570 = "lge570"
ISKRAAM550 = "iskraam550"
KAMSTRUP_HAN = "kamstrup_han"

Expand Down
2 changes: 1 addition & 1 deletion frontend/smartmeter-datacollector-configurator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Install latest LTS [nodejs (version 16.x.x)](https://nodejs.org/en/) which also

Setup the project running
```
npm install --dev
npm install --include=dev
```
inside the `frontend/smartmeter-datacollector-configurator` directory.

Expand Down
Loading

0 comments on commit 3dc63bc

Please sign in to comment.