Remove some checks, fix the ruff args, fix a wrongly executable file.

builtin-literals is better handled by a ruff linter (the ones it's finding probably are better converted) and are generally case-by-case. docstring-first is finding a false positive for a Sphinx odd case - ruff does a bunch of checks, better to leave it there. debug-statements we have for debug-code so better to disable that entirely for now
tonyandrewmeyer · May 28, 2024 · af9f15a · af9f15a
1 parent 64e8905
commit af9f15a
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 10 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,17 +4,14 @@ repos:
     hooks:
       - id: check-added-large-files
       - id: check-ast
-      - id: check-builtin-literals
       - id: check-case-conflict
-      - id: check-docstring-first
       - id: check-executables-have-shebangs
       - id: check-shebang-scripts-are-executable
       - id: check-merge-conflict
       - id: check-symlinks
       - id: check-json
       - id: check-yaml
       - id: check-toml
-      - id: debug-statements
       - id: mixed-line-ending
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -24,6 +21,6 @@ repos:
     rev: v0.4.5
     hooks:
       - id: ruff
-        args: [ check --preview ]
+        args: [ --preview ]
       - id: ruff-format
         args: [ --preview ]
diff --git a/README.md b/README.md
@@ -164,7 +164,7 @@ Congratulations, you’ve just built your first Kubernetes charm using `ops`!
 Read our [Code of conduct](https://ubuntu.com/community/code-of-conduct) and:
 - Join our chat: [Mattermost](https://chat.charmhub.io/charmhub/channels/ops)
 - Join our forum: [Discourse](https://discourse.charmhub.io/)
- 
+
 ### File an issue
 
 - Report an `ops` bug using [GitHub issues](https://github.com/canonical/operator/issues)
@@ -175,4 +175,3 @@ Read our [Code of conduct](https://ubuntu.com/community/code-of-conduct) and:
 - Read our [documentation contributor guidelines](https://discourse.charmhub.io/t/documentation-guidelines-for-contributors/1245) and help improve a doc
 - Read our [codebase contributor guidelines](HACKING.md) and help improve the codebase
 - Write a charm and publish it on [Charmhub](https://charmhub.io/)
-
diff --git a/docs/.sphinx/_templates/footer.html b/docs/.sphinx/_templates/footer.html
@@ -5,7 +5,7 @@
   {% if meta %}
     {% if 'sequential_nav' in meta %}
       {% set sequential_nav = meta.sequential_nav %}
-    {% endif %}  
+    {% endif %}
   {% endif %}
   {# mod: Conditional wrappers to control page navigation buttons #}
   {% if sequential_nav != "none" -%}

diff --git a/docs/.sphinx/pa11y.json b/docs/.sphinx/pa11y.json
@@ -6,4 +6,4 @@
   },
   "reporter": "cli",
   "standard": "WCAG2AA"
-}
+}
diff --git a/test/charms/test_main/lib/__init__.py b/test/charms/test_main/lib/__init__.py
diff --git a/test/charms/test_smoke/README.md b/test/charms/test_smoke/README.md
@@ -6,6 +6,6 @@ A simple test charm for running smoke tests.
 
 ## Usage
 
-Make sure that you are on a box with charmcraft and juju installed, and that you are connected to a "machine" controller, such as a local lxd cloud. 
+Make sure that you are on a box with charmcraft and juju installed, and that you are connected to a "machine" controller, such as a local lxd cloud.
 
 Then, from the root directory of this repository, execute `tox -e smoke` to build and deploy this charm.
diff --git a/tox.ini b/tox.ini
@@ -75,7 +75,7 @@ deps =
     typing_extensions~=4.2
 commands =
     coverage run --source={[vars]src_path} \
-             -m pytest --ignore={[vars]tst_path}smoke -v --tb native {posargs} 
+             -m pytest --ignore={[vars]tst_path}smoke -v --tb native {posargs}
     coverage report
 
 [testenv:pebble]
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ @@
       },
       "reporter": "cli",
       "standard": "WCAG2AA"
-    }
+    }