Skip to content

Commit

Permalink
Merge main
Browse files Browse the repository at this point in the history 
Signed-off-by: Nikolai Rozanov <nickolay.rozanov@gmail.com>
  • Loading branch information
@nrozanov
nrozanov committed Apr 9, 2024
2 parents c77a238 + b97f772 commit bf0bd38
Show file tree
Hide file tree
Showing 17 changed files with 242 additions and 250 deletions.
1 change: 1 addition & 0 deletions flexmeasures/ui/templates/crud/asset.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ <h3>All child assets for {{ asset.name }}</h3>
<th>Account</th>
<th>Sensors</th>
<th class="hidden">URL</th>
<th class="no-sort"></th>
</tr>
</thead>
<tbody>
Expand Down
77 changes: 39 additions & 38 deletions requirements/3.10/app.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
alembic==1.13.1
# via flask-migrate
altair==5.2.0
altair==5.3.0
# via -r requirements/app.in
arrow==1.3.0
# via rq-dashboard
Expand Down Expand Up @@ -42,21 +42,21 @@ click-default-group==1.2.4
# via -r requirements/app.in
colour==0.1.5
# via -r requirements/app.in
contourpy==1.2.0
contourpy==1.2.1
# via matplotlib
convertdate==2.4.0
# via workalendar
cycler==0.12.1
# via matplotlib
dill==0.3.8
# via openturns
dnspython==2.5.0
dnspython==2.6.1
# via email-validator
email-validator==2.1.0.post1
email-validator==2.1.1
# via
# -r requirements/app.in
# flask-security-too
filelock==3.13.1
filelock==3.13.3
# via tldextract
flask==2.2.5
# via
Expand Down Expand Up @@ -87,9 +87,9 @@ flask-login==0.6.3
# flask-security-too
flask-mail==0.9.1
# via -r requirements/app.in
flask-marshmallow==1.2.0
flask-marshmallow==1.2.1
# via -r requirements/app.in
flask-migrate==4.0.5
flask-migrate==4.0.7
# via -r requirements/app.in
flask-principal==0.4.0
# via flask-security-too
Expand All @@ -105,7 +105,7 @@ flask-wtf==1.2.1
# via
# -r requirements/app.in
# flask-security-too
fonttools==4.48.1
fonttools==4.51.0
# via matplotlib
greenlet==3.0.3
# via sqlalchemy
Expand All @@ -116,7 +116,7 @@ idna==3.6
# email-validator
# requests
# tldextract
importlib-metadata==7.0.1
importlib-metadata==7.1.0
# via
# -r requirements/app.in
# timely-beliefs
Expand Down Expand Up @@ -153,12 +153,13 @@ mako==1.3.2
# via alembic
markupsafe==2.1.5
# via
# flask-security-too
# jinja2
# mako
# sentry-sdk
# werkzeug
# wtforms
marshmallow==3.20.2
marshmallow==3.21.1
# via
# -r requirements/app.in
# flask-marshmallow
Expand All @@ -169,7 +170,7 @@ marshmallow-polyfield==5.11
# via -r requirements/app.in
marshmallow-sqlalchemy==1.0.0
# via -r requirements/app.in
matplotlib==3.8.2
matplotlib==3.8.4
# via timetomodel
numpy==1.24.4
# via
Expand All @@ -189,15 +190,15 @@ numpy==1.24.4
# uniplot
openturns==1.22
# via timely-beliefs
packaging==23.2
packaging==24.0
# via
# altair
# marshmallow
# matplotlib
# sktime
# statsmodels
# webargs
pandas==2.1.4
pandas==2.2.1
# via
# -r requirements/app.in
# altair
Expand All @@ -209,7 +210,7 @@ passlib==1.7.4
# via flask-security-too
patsy==0.5.6
# via statsmodels
pillow==10.2.0
pillow==10.3.0
# via
# -r requirements/app.in
# matplotlib
Expand All @@ -229,19 +230,19 @@ psycopg2-binary==2.9.9
# timely-beliefs
py-moneyed==3.0
# via -r requirements/app.in
pydantic==1.10.14
pydantic==1.10.15
# via
# -r requirements/app.in
# inflect
pyluach==2.2.0
# via workalendar
pymeeus==0.5.12
# via convertdate
pyomo==6.7.0
pyomo==6.7.1
# via -r requirements/app.in
pyparsing==3.1.1
pyparsing==3.1.2
# via matplotlib
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via
# arrow
# matplotlib
Expand All @@ -266,7 +267,7 @@ redis==4.6.0
# rq-dashboard
redis-sentinel-url==1.0.1
# via rq-dashboard
referencing==0.33.0
referencing==0.34.0
# via
# jsonschema
# jsonschema-specifications
Expand All @@ -276,40 +277,40 @@ requests==2.31.0
# tldextract
requests-file==2.0.0
# via tldextract
rpds-py==0.17.1
rpds-py==0.18.0
# via
# jsonschema
# referencing
rq==1.15.1
rq==1.16.1
# via
# -r requirements/app.in
# rq-dashboard
rq-dashboard==0.6.7
rq-dashboard==0.6.7.2
# via -r requirements/app.in
scikit-base==0.7.2
scikit-base==0.7.5
# via sktime
scikit-learn==1.4.0
scikit-learn==1.4.1.post1
# via
# sktime
# timetomodel
scipy==1.12.0
scipy==1.13.0
# via
# properscoring
# scikit-learn
# sktime
# statsmodels
# timely-beliefs
# timetomodel
sentry-sdk[flask]==1.40.1
sentry-sdk[flask]==1.44.1
# via -r requirements/app.in
six==1.16.0
# via
# isodate
# patsy
# python-dateutil
sktime==0.26.0
sktime==0.28.0
# via timely-beliefs
sqlalchemy==2.0.25
sqlalchemy==2.0.29
# via
# -r requirements/app.in
# alembic
Expand All @@ -321,35 +322,35 @@ statsmodels==0.14.1
# via timetomodel
tabulate==0.9.0
# via -r requirements/app.in
threadpoolctl==3.2.0
threadpoolctl==3.4.0
# via scikit-learn
timely-beliefs[forecast]==2.2.0
timely-beliefs[forecast]==2.3.0
# via -r requirements/app.in
timetomodel==0.7.3
# via -r requirements/app.in
tldextract==5.1.1
tldextract==5.1.2
# via -r requirements/app.in
toolz==0.12.1
# via altair
types-python-dateutil==2.8.19.20240106
types-python-dateutil==2.9.0.20240316
# via arrow
typing-extensions==4.9.0
typing-extensions==4.11.0
# via
# alembic
# altair
# pint
# py-moneyed
# pydantic
# sqlalchemy
tzdata==2023.4
tzdata==2024.1
# via pandas
uniplot==0.11.0
uniplot==0.12.5
# via -r requirements/app.in
urllib3==2.2.0
urllib3==2.2.1
# via
# requests
# sentry-sdk
vl-convert-python==1.2.3
vl-convert-python==1.3.0
# via -r requirements/app.in
webargs==8.4.0
# via -r requirements/app.in
Expand All @@ -366,7 +367,7 @@ wtforms==3.1.2
# flask-wtf
xlrd==2.0.1
# via -r requirements/app.in
zipp==3.17.0
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
16 changes: 8 additions & 8 deletions requirements/3.10/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@ click==8.1.7
# black
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# -c requirements/3.10/app.txt
# virtualenv
flake8==4.0.1
# via -r requirements/dev.in
flake8-blind-except==0.2.1
# via -r requirements/dev.in
identify==2.5.33
identify==2.5.35
# via pre-commit
mccabe==0.6.1
# via flake8
mypy==1.8.0
mypy==1.9.0
# via -r requirements/dev.in
mypy-extensions==1.0.0
# via
# black
# mypy
nodeenv==1.8.0
# via pre-commit
packaging==23.2
packaging==24.0
# via
# -c requirements/3.10/app.txt
# -c requirements/3.10/test.txt
Expand All @@ -46,7 +46,7 @@ platformdirs==4.2.0
# via
# black
# virtualenv
pre-commit==3.6.0
pre-commit==3.7.0
# via -r requirements/dev.in
pycodestyle==2.8.0
# via flake8
Expand All @@ -68,14 +68,14 @@ tomli==2.0.1
# black
# mypy
# setuptools-scm
typing-extensions==4.9.0
typing-extensions==4.11.0
# via
# -c requirements/3.10/app.txt
# mypy
# setuptools-scm
virtualenv==20.25.0
virtualenv==20.25.1
# via pre-commit
watchdog==3.0.0
watchdog==4.0.0
# via -r requirements/dev.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/3.10/docs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ markupsafe==2.1.5
# via
# -c requirements/3.10/app.txt
# jinja2
packaging==23.2
packaging==24.0
# via
# -c requirements/3.10/app.txt
# sphinx
Expand Down Expand Up @@ -88,7 +88,7 @@ sphinxcontrib-qthelp==1.0.7
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
urllib3==2.2.0
urllib3==2.2.1
# via
# -c requirements/3.10/app.txt
# requests
Loading

0 comments on commit bf0bd38

Please sign in to comment.