Skip to content

Commit

Permalink
build: update requirements*.in and their corresponding .txt files to …
Browse files Browse the repository at this point in the history
…match standards (#144)

* build: update requirements*.in and their corresponding .txt files to match standards

Using the same package versions for this repository as we do in others guarantee a certain
standard across all of them. This commit removes explicit package pins and upgrades some
package versions accordingly.

* build: install rustc and cargo as build packages

Some of this charm dependencies need rustc and cargo to build and install from source,
poviding this toolchain and library ensures the right tools are installed in the
environment, preventing issues when pip installing charm dependencies.
  • Loading branch information
DnPlas authored Aug 4, 2023
1 parent 8c4587e commit a716963
Show file tree
Hide file tree
Showing 15 changed files with 142 additions and 99 deletions.
5 changes: 4 additions & 1 deletion charmcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 Canonical Ltd.
# Copyright 2023 Canonical Ltd.
# See LICENSE file for licensing details.

type: charm
Expand All @@ -12,3 +12,6 @@ bases:
parts:
charm:
charm-python-packages: [setuptools, pip]
# Install rustc and cargo as build packages because some charm's
# dependencies need this to be built and installed from source.
build-packages: [rustc, cargo]
2 changes: 1 addition & 1 deletion config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 Canonical Ltd.
# Copyright 2023 Canonical Ltd.
# See LICENSE file for licensing details.

options:
Expand Down
2 changes: 1 addition & 1 deletion metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 Canonical Ltd.
# Copyright 2023 Canonical Ltd.
# See LICENSE file for licensing details.
name: dex-auth
summary: A federated OpenID Connect provider
Expand Down
6 changes: 3 additions & 3 deletions 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
24 changes: 12 additions & 12 deletions 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
anyio==3.7.1
Expand All @@ -29,7 +29,7 @@ brotli==1.0.9
# via selenium-wire
cachetools==5.3.1
# via google-auth
certifi==2023.5.7
certifi==2023.7.22
# via
# httpcore
# httpx
Expand Down Expand Up @@ -100,11 +100,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 All @@ -113,7 +113,7 @@ kaitaistruct==0.10
kubernetes==27.2.0
# via juju
lightkube==0.14.0
# via -r ./requirements-integration.in
# via -r requirements-integration.in
lightkube-models==1.27.1.4
# via lightkube
macaroonbakery==1.3.1
Expand Down Expand Up @@ -194,22 +194,22 @@ 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
# via pyrfc3339
pyyaml==6.0.1
# via
# -r ./requirements-integration.in
# -r requirements-integration.in
# juju
# jujubundlelib
# kubernetes
# lightkube
# pytest-operator
requests==2.31.0
# via
# -r ./requirements-integration.in
# -r requirements-integration.in
# kubernetes
# macaroonbakery
# requests-oauthlib
Expand All @@ -220,10 +220,10 @@ rsa==4.9
# via google-auth
selenium==4.10.0
# via
# -r ./requirements-integration.in
# -r requirements-integration.in
# selenium-wire
selenium-wire==5.1.0
# via -r ./requirements-integration.in
# via -r requirements-integration.in
six==1.16.0
# via
# asttokens
Expand All @@ -244,7 +244,7 @@ sortedcontainers==2.4.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
18 changes: 9 additions & 9 deletions 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
11 changes: 3 additions & 8 deletions requirements-unit.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
bcrypt
charmed-kubeflow-chisme
# Copyright 2023 Canonical Ltd.
# See LICENSE file for licensing details.
coverage
# Workaround for https://github.com/python-jsonschema/jsonschema/issues/1117
# and https://github.com/python-jsonschema/jsonschema/issues/1114
jsonschema<4.18
ops
pytest
pytest-mock
pytest-lazy-fixture
pyyaml
serialized-data-interface
-r requirements.txt
123 changes: 83 additions & 40 deletions requirements-unit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,108 +2,151 @@
# 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
#
anyio==3.7.1
# via httpcore
# via
# -r requirements.txt
# httpcore
attrs==23.1.0
# via jsonschema
# via
# -r requirements.txt
# jsonschema
bcrypt==4.0.1
# via -r ./requirements-unit.in
certifi==2023.5.7
# via -r requirements.txt
certifi==2023.7.22
# via
# -r requirements.txt
# httpcore
# httpx
# requests
charmed-kubeflow-chisme==0.0.11
# via -r ./requirements-unit.in
# via -r requirements.txt
charset-normalizer==3.2.0
# via requests
# via
# -r requirements.txt
# requests
coverage==7.2.7
# via -r ./requirements-unit.in
# via -r requirements-unit.in
deepdiff==6.2.1
# via charmed-kubeflow-chisme
# via
# -r requirements.txt
# charmed-kubeflow-chisme
exceptiongroup==1.1.2
# via
# -r requirements.txt
# anyio
# pytest
h11==0.14.0
# via httpcore
# via
# -r requirements.txt
# httpcore
httpcore==0.17.3
# via httpx
# via
# -r requirements.txt
# httpx
httpx==0.24.1
# via lightkube
# via
# -r requirements.txt
# lightkube
idna==3.4
# via
# -r requirements.txt
# anyio
# httpx
# requests
importlib-resources==6.0.0
# via jsonschema
# via
# -r requirements.txt
# jsonschema
iniconfig==2.0.0
# via pytest
jinja2==3.1.2
# via charmed-kubeflow-chisme
# via
# -r requirements.txt
# charmed-kubeflow-chisme
jsonschema==4.17.3
# via
# -r ./requirements-unit.in
# -r requirements.txt
# serialized-data-interface
lightkube==0.14.0
# via charmed-kubeflow-chisme
# via
# -r requirements.txt
# charmed-kubeflow-chisme
lightkube-models==1.27.1.4
# via lightkube
# via
# -r requirements.txt
# lightkube
markupsafe==2.1.3
# via jinja2
# via
# -r requirements.txt
# jinja2
ops==2.4.1
# via
# -r ./requirements-unit.in
# -r requirements-unit.in
# -r requirements.txt
# charmed-kubeflow-chisme
# serialized-data-interface
ordered-set==4.1.0
# via deepdiff
# via
# -r requirements.txt
# deepdiff
packaging==23.1
# via pytest
pkgutil-resolve-name==1.3.10
# via jsonschema
# via
# -r requirements.txt
# jsonschema
pluggy==1.2.0
# via pytest
pyrsistent==0.19.3
# via jsonschema
pytest==7.4.0
# via
# -r ./requirements-unit.in
# pytest-lazy-fixture
# pytest-mock
pytest-lazy-fixture==0.6.3
# via -r ./requirements-unit.in
pytest-mock==3.11.1
# via -r ./requirements-unit.in
# -r requirements.txt
# jsonschema
pytest==7.4.0
# via -r requirements-unit.in
pyyaml==6.0.1
# via
# -r ./requirements-unit.in
# -r requirements-unit.in
# -r requirements.txt
# lightkube
# ops
# serialized-data-interface
requests==2.31.0
# via serialized-data-interface
# via
# -r requirements.txt
# serialized-data-interface
ruamel-yaml==0.17.32
# via charmed-kubeflow-chisme
# via
# -r requirements.txt
# charmed-kubeflow-chisme
ruamel-yaml-clib==0.2.7
# via ruamel-yaml
serialized-data-interface==0.6.0
# via -r ./requirements-unit.in
# via
# -r requirements.txt
# ruamel-yaml
serialized-data-interface==0.7.0
# via -r requirements.txt
sniffio==1.3.0
# via
# -r requirements.txt
# anyio
# httpcore
# httpx
tenacity==8.2.2
# via charmed-kubeflow-chisme
# via
# -r requirements.txt
# charmed-kubeflow-chisme
tomli==2.0.1
# via pytest
urllib3==2.0.4
# via requests
# via
# -r requirements.txt
# requests
websocket-client==1.6.1
# via ops
# via
# -r requirements.txt
# ops
zipp==3.16.2
# via importlib-resources
# via
# -r requirements.txt
# importlib-resources
Loading

0 comments on commit a716963

Please sign in to comment.