Skip to content

Commit

Permalink
Merge 8d8e47e into faa184e
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nischay-Pro
Nischay-Pro committed Aug 8, 2023
2 parents faa184e + 8d8e47e commit fb898bd
Show file tree
Hide file tree
Showing 16 changed files with 162 additions and 172 deletions.
24 changes: 7 additions & 17 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ install-flexmeasures:
pip install -e .

install-pip-tools:
pip3 install -q "pip-tools>=7.0"
pip3 install -q "pip-tools>=7.2"

install-docs-dependencies:
pip install -r requirements/${PYV}/docs.txt
Expand All @@ -79,27 +79,17 @@ freeze-deps:
make ensure-deps-folder
make install-pip-tools
pip-compile -o requirements/${PYV}/app.txt requirements/app.in
# Create app.txt to create constraints for test.txt and dev.txt
cat requirements/${PYV}/app.txt > requirements/app.txt
pip-compile -o requirements/${PYV}/test.txt requirements/test.in
cat requirements/${PYV}/test.txt > requirements/test.txt
pip-compile -o requirements/${PYV}/dev.txt requirements/dev.in
pip-compile -o requirements/${PYV}/docs.txt requirements/docs.in
rm requirements/app.txt
rm requirements/test.txt
pip-compile -c requirements/${PYV}/app.txt -o requirements/${PYV}/test.txt requirements/test.in
pip-compile -c requirements/${PYV}/app.txt -c requirements/${PYV}/test.txt -o requirements/${PYV}/dev.txt requirements/dev.in
pip-compile -c requirements/${PYV}/app.txt -o requirements/${PYV}/docs.txt requirements/docs.in

upgrade-deps:
make ensure-deps-folder
make install-pip-tools
pip-compile --upgrade -o requirements/${PYV}/app.txt requirements/app.in
# Create app.txt to create constraints for test.txt and dev.txt
cat requirements/${PYV}/app.txt > requirements/app.txt
pip-compile --upgrade -o requirements/${PYV}/test.txt requirements/test.in
cat requirements/${PYV}/test.txt > requirements/test.txt
pip-compile --upgrade -o requirements/${PYV}/dev.txt requirements/dev.in
pip-compile --upgrade -o requirements/${PYV}/docs.txt requirements/docs.in
rm requirements/app.txt
rm requirements/test.txt
pip-compile --upgrade -c requirements/${PYV}/app.txt -o requirements/${PYV}/test.txt requirements/test.in
pip-compile --upgrade -c requirements/${PYV}/app.txt -c requirements/${PYV}/test.txt -o requirements/${PYV}/dev.txt requirements/dev.in
pip-compile --upgrade -c requirements/${PYV}/app.txt -o requirements/${PYV}/docs.txt requirements/docs.in

make test

Expand Down
18 changes: 9 additions & 9 deletions requirements/3.10/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --output-file=requirements/3.10/dev.txt requirements/dev.in
# pip-compile --constraint=requirements/3.10/app.txt --constraint=requirements/3.10/test.txt --output-file=requirements/3.10/dev.txt requirements/dev.in
#
black==22.3.0
# via -r requirements/dev.in
cfgv==3.3.1
# via pre-commit
click==8.1.3
# via
# -c requirements/app.txt
# -c requirements/test.txt
# -c requirements/3.10/app.txt
# -c requirements/3.10/test.txt
# black
distlib==0.3.6
# via virtualenv
filelock==3.12.2
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# virtualenv
flake8==4.0.1
# via -r requirements/dev.in
Expand All @@ -37,8 +37,8 @@ nodeenv==1.8.0
# via pre-commit
packaging==23.1
# via
# -c requirements/app.txt
# -c requirements/test.txt
# -c requirements/3.10/app.txt
# -c requirements/3.10/test.txt
# setuptools-scm
pathspec==0.11.1
# via black
Expand All @@ -58,19 +58,19 @@ pytest-runner==6.0.0
# via -r requirements/dev.in
pyyaml==6.0.1
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# pre-commit
setuptools-scm==7.1.0
# via -r requirements/dev.in
tomli==2.0.1
# via
# -c requirements/test.txt
# -c requirements/3.10/test.txt
# black
# mypy
# setuptools-scm
typing-extensions==4.7.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# mypy
# setuptools-scm
virtualenv==20.23.1
Expand Down
22 changes: 11 additions & 11 deletions requirements/3.10/docs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --output-file=requirements/3.10/docs.txt requirements/docs.in
# pip-compile --constraint=requirements/3.10/app.txt --output-file=requirements/3.10/docs.txt requirements/docs.in
#
alabaster==0.7.13
# via sphinx
babel==2.12.1
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# sphinx
certifi==2023.5.7
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests
charset-normalizer==3.1.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests
docutils==0.18.1
# via
Expand All @@ -25,33 +25,33 @@ docutils==0.18.1
# sphinx-tabs
idna==3.4
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests
imagesize==1.4.1
# via sphinx
jinja2==3.1.2
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# sphinx
markupsafe==2.1.3
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# jinja2
packaging==23.1
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# sphinx
pygments==2.15.1
# via
# sphinx
# sphinx-tabs
requests==2.31.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# sphinx
six==1.16.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# sphinxcontrib-httpdomain
snowballstemmer==2.2.0
# via sphinx
Expand Down Expand Up @@ -90,5 +90,5 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
urllib3==2.0.3
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests
32 changes: 16 additions & 16 deletions requirements/3.10/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --output-file=requirements/3.10/test.txt requirements/test.in
# pip-compile --constraint=requirements/3.10/app.txt --output-file=requirements/3.10/test.txt requirements/test.in
#
async-timeout==4.0.2
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# redis
certifi==2023.5.7
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests
charset-normalizer==3.1.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests
click==8.1.3
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# flask
coverage[toml]==7.2.7
# via pytest-cov
Expand All @@ -28,33 +28,33 @@ fakeredis==2.15.0
# via -r requirements/test.in
flask==2.1.2
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# pytest-flask
highspy==1.5.3
# via -r requirements/test.in
idna==3.4
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests
iniconfig==2.0.0
# via pytest
itsdangerous==2.1.2
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# flask
jinja2==3.1.2
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# flask
lupa==2.0
# via -r requirements/test.in
markupsafe==2.1.3
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# jinja2
packaging==23.1
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# pytest
# pytest-sugar
pluggy==1.2.0
Expand All @@ -73,18 +73,18 @@ pytest-sugar==0.9.7
# via -r requirements/test.in
redis==4.6.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# fakeredis
requests==2.31.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# -r requirements/test.in
# requests-mock
requests-mock==1.11.0
# via -r requirements/test.in
six==1.16.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests-mock
sortedcontainers==2.4.0
# via fakeredis
Expand All @@ -96,10 +96,10 @@ tomli==2.0.1
# pytest
urllib3==2.0.3
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# requests
werkzeug==2.1.0
# via
# -c requirements/app.txt
# -c requirements/3.10/app.txt
# flask
# pytest-flask
16 changes: 8 additions & 8 deletions requirements/3.11/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=requirements/3.11/dev.txt requirements/dev.in
# pip-compile --constraint=requirements/3.11/app.txt --constraint=requirements/3.11/test.txt --output-file=requirements/3.11/dev.txt requirements/dev.in
#
black==22.3.0
# via -r requirements/dev.in
cfgv==3.3.1
# via pre-commit
click==8.1.3
# via
# -c requirements/app.txt
# -c requirements/test.txt
# -c requirements/3.11/app.txt
# -c requirements/3.11/test.txt
# black
distlib==0.3.6
# via virtualenv
filelock==3.12.2
# via
# -c requirements/app.txt
# -c requirements/3.11/app.txt
# virtualenv
flake8==4.0.1
# via -r requirements/dev.in
Expand All @@ -37,8 +37,8 @@ nodeenv==1.8.0
# via pre-commit
packaging==23.1
# via
# -c requirements/app.txt
# -c requirements/test.txt
# -c requirements/3.11/app.txt
# -c requirements/3.11/test.txt
# setuptools-scm
pathspec==0.11.1
# via black
Expand All @@ -58,13 +58,13 @@ pytest-runner==6.0.0
# via -r requirements/dev.in
pyyaml==6.0.1
# via
# -c requirements/app.txt
# -c requirements/3.11/app.txt
# pre-commit
setuptools-scm==7.1.0
# via -r requirements/dev.in
typing-extensions==4.7.0
# via
# -c requirements/app.txt
# -c requirements/3.11/app.txt
# mypy
# setuptools-scm
virtualenv==20.23.1
Expand Down
Loading

0 comments on commit fb898bd

Please sign in to comment.