Skip to content

Commit

Permalink
Merge branch 'main' into documentation/reporting/reporter-tutorial
Browse files Browse the repository at this point in the history 
Signed-off-by: Victor <victor@seita.nl>
  • Loading branch information
@victorgarcia98
victorgarcia98 committed Aug 24, 2023
2 parents 8edb02c + 79c85e4 commit 4901e80
Show file tree
Hide file tree
Showing 17 changed files with 250 additions and 202 deletions.
6 changes: 6 additions & 0 deletions documentation/changelog.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ FlexMeasures Changelog
v0.15.1 | August XX, 2023
============================

New features
-------------

* Introduce new reporter to compute profit/loss due to electricity flows: `ProfitOrLossReporter` [see `PR #808 <https://github.com/FlexMeasures/flexmeasures/pull/808>`_]


Bugfixes
-----------

Expand Down
87 changes: 47 additions & 40 deletions requirements/3.10/app.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@
#
# pip-compile --output-file=requirements/3.10/app.txt requirements/app.in
#
alembic==1.11.1
alembic==1.11.3
# via flask-migrate
altair==5.0.1
# via -r requirements/app.in
arrow==1.2.3
# via rq-dashboard
async-timeout==4.0.2
async-timeout==4.0.3
# via redis
attrs==23.1.0
# via jsonschema
# via
# jsonschema
# referencing
babel==2.12.1
# via py-moneyed
bcrypt==4.0.1
Expand All @@ -24,19 +26,19 @@ blinker==1.6.2
# flask-principal
# flask-security-too
# sentry-sdk
certifi==2023.5.7
certifi==2023.7.22
# via
# requests
# sentry-sdk
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via requests
click==8.1.3
click==8.1.7
# via
# -r requirements/app.in
# click-default-group
# flask
# rq
click-default-group==1.2.2
click-default-group==1.2.4
# via -r requirements/app.in
colour==0.1.5
# via -r requirements/app.in
Expand All @@ -46,11 +48,9 @@ convertdate==2.4.0
# via workalendar
cycler==0.11.0
# via matplotlib
deprecated==1.2.14
# via sktime
dill==0.3.6
dill==0.3.7
# via openturns
dnspython==2.3.0
dnspython==2.4.2
# via email-validator
email-validator==2.0.0.post2
# via
Expand Down Expand Up @@ -105,18 +105,18 @@ flask-wtf==1.1.1
# via
# -r requirements/app.in
# flask-security-too
fonttools==4.40.0
fonttools==4.42.1
# via matplotlib
greenlet==2.0.2
# via sqlalchemy
humanize==4.7.0
humanize==4.8.0
# via -r requirements/app.in
idna==3.4
# via
# email-validator
# requests
# tldextract
importlib-metadata==6.7.0
importlib-metadata==6.8.0
# via
# -r requirements/app.in
# timely-beliefs
Expand All @@ -139,10 +139,12 @@ jinja2==3.1.2
# via
# altair
# flask
joblib==1.3.1
joblib==1.3.2
# via scikit-learn
jsonschema==4.17.3
jsonschema==4.19.0
# via altair
jsonschema-specifications==2023.7.1
# via jsonschema
kiwisolver==1.4.4
# via matplotlib
lunardate==0.2.0
Expand All @@ -155,7 +157,7 @@ markupsafe==2.1.3
# mako
# sentry-sdk
# wtforms
marshmallow==3.19.0
marshmallow==3.20.1
# via
# -r requirements/app.in
# flask-marshmallow
Expand All @@ -166,9 +168,9 @@ marshmallow-polyfield==5.11
# via -r requirements/app.in
marshmallow-sqlalchemy==0.29.0
# via -r requirements/app.in
matplotlib==3.7.1
matplotlib==3.7.2
# via timetomodel
numpy==1.23.5
numpy==1.24.4
# via
# -r requirements/app.in
# altair
Expand Down Expand Up @@ -206,9 +208,9 @@ passlib==1.7.4
# via flask-security-too
patsy==0.5.3
# via statsmodels
pillow==9.5.0
pillow==10.0.0
# via matplotlib
pint==0.21.1
pint==0.22
# via -r requirements/app.in
ply==3.11
# via pyomo
Expand All @@ -218,13 +220,13 @@ pscript==0.7.7
# via -r requirements/app.in
psutil==5.9.5
# via openturns
psycopg2-binary==2.9.6
psycopg2-binary==2.9.7
# via
# -r requirements/app.in
# timely-beliefs
py-moneyed==3.0
# via -r requirements/app.in
pydantic==1.10.10
pydantic==1.10.12
# via
# -r requirements/app.in
# inflect
Expand All @@ -234,10 +236,8 @@ pymeeus==0.5.12
# via convertdate
pyomo==6.6.1
# via -r requirements/app.in
pyparsing==3.1.0
pyparsing==3.0.9
# via matplotlib
pyrsistent==0.19.3
# via jsonschema
python-dateutil==2.8.2
# via
# arrow
Expand All @@ -260,33 +260,41 @@ redis==4.6.0
# -r requirements/app.in
# rq
# rq-dashboard
referencing==0.30.2
# via
# jsonschema
# jsonschema-specifications
requests==2.31.0
# via
# requests-file
# tldextract
requests-file==1.5.1
# via tldextract
rpds-py==0.9.2
# via
# jsonschema
# referencing
rq==1.15.1
# via
# -r requirements/app.in
# rq-dashboard
rq-dashboard==0.6.1
# via -r requirements/app.in
scikit-base==0.5.0
scikit-base==0.5.1
# via sktime
scikit-learn==1.2.2
scikit-learn==1.3.0
# via
# sktime
# timetomodel
scipy==1.10.1
scipy==1.11.2
# via
# properscoring
# scikit-learn
# sktime
# statsmodels
# timely-beliefs
# timetomodel
sentry-sdk[flask]==1.26.0
sentry-sdk[flask]==1.29.2
# via -r requirements/app.in
six==1.16.0
# via
Expand All @@ -295,9 +303,9 @@ six==1.16.0
# patsy
# python-dateutil
# requests-file
sktime==0.20.0
sktime==0.22.0
# via timely-beliefs
sqlalchemy==1.4.48
sqlalchemy==1.4.49
# via
# -r requirements/app.in
# alembic
Expand All @@ -309,7 +317,7 @@ statsmodels==0.14.0
# via timetomodel
tabulate==0.9.0
# via -r requirements/app.in
threadpoolctl==3.1.0
threadpoolctl==3.2.0
# via scikit-learn
timely-beliefs[forecast]==1.21.0
# via -r requirements/app.in
Expand All @@ -319,21 +327,22 @@ tldextract==3.4.4
# via -r requirements/app.in
toolz==0.12.0
# via altair
typing-extensions==4.7.0
typing-extensions==4.7.1
# via
# alembic
# altair
# pint
# py-moneyed
# pydantic
tzdata==2023.3
# via pandas
uniplot==0.10.0
uniplot==0.10.1
# via -r requirements/app.in
urllib3==2.0.3
urllib3==2.0.4
# via
# requests
# sentry-sdk
webargs==8.2.0
webargs==8.3.0
# via -r requirements/app.in
werkzeug==2.1.0
# via
Expand All @@ -342,15 +351,13 @@ werkzeug==2.1.0
# flask-login
workalendar==17.0.0
# via -r requirements/app.in
wrapt==1.15.0
# via deprecated
wtforms==3.0.1
# via
# flask-security-too
# flask-wtf
xlrd==2.0.1
# via -r requirements/app.in
zipp==3.15.0
zipp==3.16.2
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
20 changes: 10 additions & 10 deletions requirements/3.10/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
#
black==22.3.0
# via -r requirements/dev.in
cfgv==3.3.1
cfgv==3.4.0
# via pre-commit
click==8.1.3
click==8.1.7
# via
# -c requirements/app.txt
# -c requirements/test.txt
# black
distlib==0.3.6
distlib==0.3.7
# via virtualenv
filelock==3.12.2
# via
Expand All @@ -23,11 +23,11 @@ flake8==4.0.1
# via -r requirements/dev.in
flake8-blind-except==0.2.1
# via -r requirements/dev.in
identify==2.5.24
identify==2.5.27
# via pre-commit
mccabe==0.6.1
# via flake8
mypy==1.4.1
mypy==1.5.1
# via -r requirements/dev.in
mypy-extensions==1.0.0
# via
Expand All @@ -40,9 +40,9 @@ packaging==23.1
# -c requirements/app.txt
# -c requirements/test.txt
# setuptools-scm
pathspec==0.11.1
pathspec==0.11.2
# via black
platformdirs==3.8.0
platformdirs==3.10.0
# via
# black
# virtualenv
Expand All @@ -52,7 +52,7 @@ pycodestyle==2.8.0
# via flake8
pyflakes==2.4.0
# via flake8
pyinstrument==4.5.0
pyinstrument==4.5.1
# via -r requirements/dev.in
pytest-runner==6.0.0
# via -r requirements/dev.in
Expand All @@ -68,12 +68,12 @@ tomli==2.0.1
# black
# mypy
# setuptools-scm
typing-extensions==4.7.0
typing-extensions==4.7.1
# via
# -c requirements/app.txt
# mypy
# setuptools-scm
virtualenv==20.23.1
virtualenv==20.24.3
# via pre-commit
watchdog==3.0.0
# via -r requirements/dev.in
Expand Down
Loading

0 comments on commit 4901e80

Please sign in to comment.