Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: bump juju 2.9.44.0, sdi->0.7.0, pyyaml->6.0.1 #116

Merged
merged 2 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion charms/argo-controller/requirements-integration.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
aiohttp
jinja2
juju<3.1
# Pinning to <3.0 due to compatibility with the 2.9 controller version and 3.0 not being maintained anymore
juju<3.0
pytest-operator
requests
tenacity
Expand Down
23 changes: 17 additions & 6 deletions charms/argo-controller/requirements-integration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ idna==2.10
# -r requirements.txt
# requests
# yarl
importlib-resources==6.0.0
# via
# -r requirements.txt
# jsonschema
iniconfig==1.1.1
# via pytest
ipdb==0.13.9
Expand All @@ -72,11 +76,11 @@ jinja2==3.1.2
# via
# -r requirements-integration.in
# pytest-operator
jsonschema==3.2
jsonschema==4.17.3
# via
# -r requirements.txt
# serialized-data-interface
juju==3.0.4
juju==2.9.44.0
# via
# -r requirements-integration.in
# pytest-operator
Expand Down Expand Up @@ -116,6 +120,10 @@ pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pkgutil-resolve-name==1.3.10
# via
# -r requirements.txt
# jsonschema
pluggy==1.0.0
# via pytest
prompt-toolkit==3.0.36
Expand Down Expand Up @@ -164,7 +172,7 @@ python-dateutil==2.8.2
# via kubernetes
pytz==2022.6
# via pyrfc3339
pyyaml==5.4
pyyaml==6.0.1
# via
# -r requirements.txt
# juju
Expand All @@ -186,13 +194,12 @@ requests-oauthlib==1.3.1
# via kubernetes
rsa==4.9
# via google-auth
serialized-data-interface==0.4.0
serialized-data-interface==0.7.0
# via -r requirements.txt
six==1.16.0
# via
# -r requirements.txt
# asttokens
# google-auth
# jsonschema
# kubernetes
# macaroonbakery
# paramiko
Expand Down Expand Up @@ -231,6 +238,10 @@ websockets==7.0
# via juju
yarl==1.8.2
# via aiohttp
zipp==3.16.2
# via
# -r requirements.txt
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# setuptools
27 changes: 16 additions & 11 deletions charms/argo-controller/requirements-unit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ idna==2.10
# via
# -r requirements.txt
# requests
importlib-resources==6.0.0
# via
# -r requirements.txt
# jsonschema
iniconfig==1.1.1
# via pytest
jsonschema==3.2
jsonschema==4.17.3
# via
# -r requirements.txt
# serialized-data-interface
Expand All @@ -39,6 +43,10 @@ ops==1.5.4
# serialized-data-interface
packaging==22.0
# via pytest
pkgutil-resolve-name==1.3.10
# via
# -r requirements.txt
# jsonschema
pluggy==1.0.0
# via pytest
pyrsistent==0.19.2
Expand All @@ -54,27 +62,24 @@ pytest-lazy-fixture==0.6.3
# via -r requirements-unit.in
pytest-mock==3.10.0
# via -r requirements-unit.in
pyyaml==5.4
pyyaml==6.0.1
# via
# -r requirements.txt
# ops
# serialized-data-interface
requests==2.25
requests==2.25.0
# via
# -r requirements.txt
# serialized-data-interface
serialized-data-interface==0.4.0
serialized-data-interface==0.7.0
# via -r requirements.txt
six==1.16.0
# via
# -r requirements.txt
# jsonschema
tomli==2.0.1
# via pytest
urllib3==1.26.13
# via
# -r requirements.txt
# requests

# The following packages are considered to be unsafe in a requirements file:
# setuptools
zipp==3.16.2
# via
# -r requirements.txt
# importlib-resources
19 changes: 10 additions & 9 deletions charms/argo-controller/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,29 @@ chardet==3.0.4
# via requests
idna==2.10
# via requests
jsonschema==3.2
importlib-resources==6.0.0
# via jsonschema
jsonschema==4.17.3
# via serialized-data-interface
oci-image==1.0.0
# via -r requirements.in
ops==1.5.4
# via
# -r requirements.in
# serialized-data-interface
pkgutil-resolve-name==1.3.10
# via jsonschema
pyrsistent==0.19.2
# via jsonschema
pyyaml==5.4
pyyaml==6.0.1
# via
# ops
# serialized-data-interface
requests==2.25
requests==2.25.0
# via serialized-data-interface
serialized-data-interface==0.4.0
serialized-data-interface==0.7.0
# via -r requirements.in
six==1.16.0
# via jsonschema
urllib3==1.26.13
# via requests

# The following packages are considered to be unsafe in a requirements file:
# setuptools
zipp==3.16.2
# via importlib-resources
2 changes: 1 addition & 1 deletion charms/argo-server/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ bases:
parts:
charm:
# do not use these versions due to pypa/setuptools_scm#713
charm-python-packages: [setuptools!=62.2.0, pip!=22.1]
charm-python-packages: [setuptools, pip]
2 changes: 1 addition & 1 deletion charms/argo-server/requirements-unit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pytest-lazy-fixture==0.6.3
# via -r requirements-unit.in
pytest-mock==3.10.0
# via -r requirements-unit.in
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements-unit.in
# -r requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion charms/argo-server/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ oci-image==1.0.0
# via -r requirements.in
ops==2.1.1
# via -r requirements.in
pyyaml==6.0
pyyaml==6.0.1
# via ops
websocket-client==1.5.1
# via ops
Loading