Skip to content

Commit

Permalink
change tox for update dependencies (#100)
Browse files Browse the repository at this point in the history
* update reqs.txt

* update reqs.txt

* added env
  • Loading branch information
beliaev-maksim authored Jul 27, 2023
1 parent 216817b commit 3b56054
Show file tree
Hide file tree
Showing 12 changed files with 83 additions and 68 deletions.
6 changes: 3 additions & 3 deletions charms/argo-controller/requirements-fmt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements-fmt.in
# pip-compile requirements-fmt.in
#
black==23.7.0
# via -r ./requirements-fmt.in
# via -r requirements-fmt.in
click==8.1.6
# via black
isort==5.12.0
# via -r ./requirements-fmt.in
# via -r requirements-fmt.in
mypy-extensions==1.0.0
# via black
packaging==23.1
Expand Down
14 changes: 7 additions & 7 deletions charms/argo-controller/requirements-integration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements-integration.in
# pip-compile requirements-integration.in
#
aiohttp==3.8.5
# via -r ./requirements-integration.in
# via -r requirements-integration.in
aiosignal==1.3.1
# via aiohttp
asttokens==2.2.1
Expand Down Expand Up @@ -62,11 +62,11 @@ jedi==0.18.2
# via ipython
jinja2==3.1.2
# via
# -r ./requirements-integration.in
# -r requirements-integration.in
# pytest-operator
juju==2.9.44.0
# via
# -r ./requirements-integration.in
# -r requirements-integration.in
# pytest-operator
jujubundlelib==0.5.7
# via theblues
Expand Down Expand Up @@ -139,7 +139,7 @@ pytest==7.4.0
pytest-asyncio==0.21.1
# via pytest-operator
pytest-operator==0.28.0
# via -r ./requirements-integration.in
# via -r requirements-integration.in
python-dateutil==2.8.2
# via kubernetes
pytz==2023.3
Expand All @@ -152,7 +152,7 @@ pyyaml==6.0.1
# pytest-operator
requests==2.31.0
# via
# -r ./requirements-integration.in
# -r requirements-integration.in
# kubernetes
# macaroonbakery
# requests-oauthlib
Expand All @@ -173,7 +173,7 @@ six==1.16.0
stack-data==0.6.2
# via ipython
tenacity==8.2.2
# via -r ./requirements-integration.in
# via -r requirements-integration.in
theblues==0.5.2
# via juju
tomli==2.0.1
Expand Down
20 changes: 10 additions & 10 deletions charms/argo-controller/requirements-lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements-lint.in
# pip-compile requirements-lint.in
#
black==23.7.0
# via -r ./requirements-lint.in
# via -r requirements-lint.in
click==8.1.6
# via black
codespell==2.2.5
# via -r ./requirements-lint.in
# via -r requirements-lint.in
colorama==0.4.6
# via -r ./requirements-lint.in
# via -r requirements-lint.in
flake8==6.0.0
# via
# -r ./requirements-lint.in
# -r requirements-lint.in
# flake8-builtins
# pep8-naming
# pyproject-flake8
flake8-builtins==2.1.0
# via -r ./requirements-lint.in
# via -r requirements-lint.in
flake8-copyright==0.2.4
# via -r ./requirements-lint.in
# via -r requirements-lint.in
isort==5.12.0
# via -r ./requirements-lint.in
# via -r requirements-lint.in
mccabe==0.7.0
# via flake8
mypy-extensions==1.0.0
Expand All @@ -33,15 +33,15 @@ packaging==23.1
pathspec==0.11.1
# via black
pep8-naming==0.13.3
# via -r ./requirements-lint.in
# via -r requirements-lint.in
platformdirs==3.9.1
# via black
pycodestyle==2.10.0
# via flake8
pyflakes==3.0.1
# via flake8
pyproject-flake8==6.0.0.post1
# via -r ./requirements-lint.in
# via -r requirements-lint.in
tomli==2.0.1
# via
# black
Expand Down
20 changes: 10 additions & 10 deletions charms/argo-controller/requirements-unit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements-unit.in
# pip-compile requirements-unit.in
#
attrs==23.1.0
# via jsonschema
Expand All @@ -11,7 +11,7 @@ certifi==2023.7.22
charset-normalizer==3.2.0
# via requests
coverage==7.2.7
# via -r ./requirements-unit.in
# via -r requirements-unit.in
exceptiongroup==1.1.2
# via pytest
idna==3.4
Expand All @@ -23,11 +23,11 @@ iniconfig==2.0.0
jsonschema==4.17.3
# via serialized-data-interface
oci-image==1.0.0
# via -r ./requirements.in
# via -r requirements.in
ops==2.4.1
# via
# -r ./requirements-unit.in
# -r ./requirements.in
# -r requirements-unit.in
# -r requirements.in
# serialized-data-interface
packaging==23.1
# via pytest
Expand All @@ -39,22 +39,22 @@ pyrsistent==0.19.3
# via jsonschema
pytest==7.4.0
# via
# -r ./requirements-unit.in
# -r requirements-unit.in
# pytest-lazy-fixture
# pytest-mock
pytest-lazy-fixture==0.6.3
# via -r ./requirements-unit.in
# via -r requirements-unit.in
pytest-mock==3.11.1
# via -r ./requirements-unit.in
# via -r requirements-unit.in
pyyaml==6.0.1
# via
# -r ./requirements-unit.in
# -r requirements-unit.in
# ops
# serialized-data-interface
requests==2.31.0
# via serialized-data-interface
serialized-data-interface==0.7.0
# via -r ./requirements.in
# via -r requirements.in
tomli==2.0.1
# via pytest
urllib3==2.0.4
Expand Down
8 changes: 4 additions & 4 deletions charms/argo-controller/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements.in
# pip-compile requirements.in
#
attrs==23.1.0
# via jsonschema
Expand All @@ -17,10 +17,10 @@ importlib-resources==6.0.0
jsonschema==4.17.3
# via serialized-data-interface
oci-image==1.0.0
# via -r ./requirements.in
# via -r requirements.in
ops==2.4.1
# via
# -r ./requirements.in
# -r requirements.in
# serialized-data-interface
pkgutil-resolve-name==1.3.10
# via jsonschema
Expand All @@ -33,7 +33,7 @@ pyyaml==6.0.1
requests==2.31.0
# via serialized-data-interface
serialized-data-interface==0.7.0
# via -r ./requirements.in
# via -r requirements.in
urllib3==2.0.4
# via requests
websocket-client==1.6.1
Expand Down
10 changes: 5 additions & 5 deletions charms/argo-controller/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ allowlist_externals =
find
pip-compile
xargs
commands =
; uses 'bash -c' because piping didn't work in regular tox commands
pip-compile requirements.in
pip-compile requirements-fmt.in
bash -c 'find . -type f -name "requirements*.in" | xargs --replace=\{\} pip-compile --resolver=backtracking \{\}'
commands =
; we must preserve the order of compilation, since each *.in file depends on some *.txt file.
; For example, requirements-unit.in depends on requirements.txt and we must compile first
; requirements.txt to ensure that requirements-unit.txt get the same dependency as the requirements.txt
bash -c 'for pattern in "requirements.in" "requirements-fmt.in" "requirements*.in"; do find . -type f -name "$pattern" -exec bash -c "cd \$(dirname "{}") && pip-compile --resolver=backtracking \$(basename "{}")" \;; done'
deps =
pip-tools
description = Update requirements files by executing pip-compile on all requirements*.in files, including those in subdirs.
Expand Down
6 changes: 3 additions & 3 deletions charms/argo-server/requirements-fmt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements-fmt.in
# pip-compile requirements-fmt.in
#
black==23.7.0
# via -r ./requirements-fmt.in
# via -r requirements-fmt.in
click==8.1.6
# via black
isort==5.12.0
# via -r ./requirements-fmt.in
# via -r requirements-fmt.in
mypy-extensions==1.0.0
# via black
packaging==23.1
Expand Down
18 changes: 9 additions & 9 deletions charms/argo-server/requirements-lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements-lint.in
# pip-compile requirements-lint.in
#
black==23.7.0
# via -r ./requirements-lint.in
# via -r requirements-lint.in
click==8.1.6
# via black
codespell==2.2.5
# via -r ./requirements-lint.in
# via -r requirements-lint.in
flake8==6.0.0
# via
# -r ./requirements-lint.in
# -r requirements-lint.in
# flake8-builtins
# pep8-naming
# pyproject-flake8
flake8-builtins==2.1.0
# via -r ./requirements-lint.in
# via -r requirements-lint.in
flake8-copyright==0.2.4
# via -r ./requirements-lint.in
# via -r requirements-lint.in
isort==5.12.0
# via -r ./requirements-lint.in
# via -r requirements-lint.in
mccabe==0.7.0
# via flake8
mypy-extensions==1.0.0
Expand All @@ -31,15 +31,15 @@ packaging==23.1
pathspec==0.11.1
# via black
pep8-naming==0.13.3
# via -r ./requirements-lint.in
# via -r requirements-lint.in
platformdirs==3.9.1
# via black
pycodestyle==2.10.0
# via flake8
pyflakes==3.0.1
# via flake8
pyproject-flake8==6.0.0.post1
# via -r ./requirements-lint.in
# via -r requirements-lint.in
tomli==2.0.1
# via
# black
Expand Down
18 changes: 9 additions & 9 deletions charms/argo-server/requirements-unit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements-unit.in
# pip-compile requirements-unit.in
#
coverage==7.2.7
# via -r ./requirements-unit.in
# via -r requirements-unit.in
exceptiongroup==1.1.2
# via pytest
iniconfig==2.0.0
# via pytest
oci-image==1.0.0
# via -r ./requirements.in
# via -r requirements.in
ops==2.4.1
# via
# -r ./requirements-unit.in
# -r ./requirements.in
# -r requirements-unit.in
# -r requirements.in
packaging==23.1
# via pytest
pluggy==1.2.0
# via pytest
pytest==7.4.0
# via
# -r ./requirements-unit.in
# -r requirements-unit.in
# pytest-lazy-fixture
# pytest-mock
pytest-lazy-fixture==0.6.3
# via -r ./requirements-unit.in
# via -r requirements-unit.in
pytest-mock==3.11.1
# via -r ./requirements-unit.in
# via -r requirements-unit.in
pyyaml==6.0.1
# via
# -r ./requirements-unit.in
# -r requirements-unit.in
# ops
tomli==2.0.1
# via pytest
Expand Down
6 changes: 3 additions & 3 deletions charms/argo-server/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile ./requirements.in
# pip-compile requirements.in
#
oci-image==1.0.0
# via -r ./requirements.in
# via -r requirements.in
ops==2.4.1
# via -r ./requirements.in
# via -r requirements.in
pyyaml==6.0.1
# via ops
websocket-client==1.6.1
Expand Down
10 changes: 5 additions & 5 deletions charms/argo-server/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ allowlist_externals =
find
pip-compile
xargs
commands =
; uses 'bash -c' because piping didn't work in regular tox commands
pip-compile requirements.in
pip-compile requirements-fmt.in
bash -c 'find . -type f -name "requirements*.in" | xargs --replace=\{\} pip-compile --resolver=backtracking \{\}'
commands =
; we must preserve the order of compilation, since each *.in file depends on some *.txt file.
; For example, requirements-unit.in depends on requirements.txt and we must compile first
; requirements.txt to ensure that requirements-unit.txt get the same dependency as the requirements.txt
bash -c 'for pattern in "requirements.in" "requirements-fmt.in" "requirements*.in"; do find . -type f -name "$pattern" -exec bash -c "cd \$(dirname "{}") && pip-compile --resolver=backtracking \$(basename "{}")" \;; done'
deps =
pip-tools
description = Update requirements files by executing pip-compile on all requirements*.in files, including those in subdirs.
Expand Down
Loading

0 comments on commit 3b56054

Please sign in to comment.