Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: canonical/katib-operators
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a589f9e7a13be8b7cfd07fc529a80c8168a789c2
Choose a base ref
..
head repository: canonical/katib-operators
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fabc3e8224ab7e0a65eb4c0f42adc99bd9a0e80c
Choose a head ref
Showing with 6 additions and 17 deletions.
  1. +4 −16 .github/workflows/integrate.yaml
  2. +2 −1 tox.ini
20 changes: 4 additions & 16 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
@@ -26,21 +26,9 @@ jobs:
runs-on: ubuntu-20.04

steps:
- name: Check out code
uses: actions/checkout@v4

- name: Install dependencies
run: |
set -eux
sudo apt update
sudo apt install python3-setuptools
sudo pip3 install black flake8
- name: Check black
run: black --check charms/*/src

- name: Check flake8
run: flake8 ./charms/*/src
- uses: actions/checkout@v4
- run: python3 -m pip install tox
- run: tox -e lint

unit:
name: Unit tests
@@ -167,7 +155,7 @@ jobs:
if: failure()

- name: Upload charmcraft logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: charmcraft-logs
path: /tmp/charmcraft-log-*
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ allowlist_externals =
bash
find
pip-compile
commands =
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
@@ -56,6 +56,7 @@ commands =
codespell {toxinidir}/. --skip {toxinidir}/./.git --skip {toxinidir}/./.tox \
--skip {toxinidir}/./build --skip {toxinidir}/./lib --skip {toxinidir}/./venv \
--skip {toxinidir}/./.mypy_cache \
--skip {toxinidir}/./charms/katib-controller/src/templates/webhooks.yaml.j2 \
--skip {toxinidir}/./icon.svg --skip *.json.tmpl
# pflake8 wrapper supports config from pyproject.toml
pflake8 {[vars]all_path}