get ci pipelines functional, and switch to ruff linter/formatter

.flake8

@@ -1,4 +1,7 @@
 [flake8]
 max-line-length = 127
-extend-ignore = E203, W503
-max-complexity = 10
+extend-ignore = E203, E701, W503
+max-complexity = 10
+exclude =
+    __pycache__
+    .venv

.github/actions/setup/action.yml

@@ -12,7 +12,7 @@ runs:
       run: pip install --quiet --upgrade --requirement requirements.txt
     - name: Install CI dependencies
       shell: bash
-      run: pip install --quiet --upgrade --requirement requirements-ci.txt
+      run: pip install --quiet --upgrade --requirement .github/requirements-ci.txt
     - name: Install cog dependencies
       shell: bash
       run: |

.github/requirements-ci.txt

@@ -0,0 +1,6 @@
+fastjsonschema==2.19.1
+pytest==8.2.0
+pytest-asyncio==0.23.6
+pytest-aiohttp==1.0.5
+mypy==1.10.0
+ruff==0.4.4

.github/workflows/ci.yml

@@ -3,49 +3,24 @@ name: CI
 on: [pull_request]
 
 jobs:
-  lint-flake8:
+  ruff:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository at the current branch
         uses: actions/checkout@v2
       - name: Install dependencies
         uses: ./.github/actions/setup
-      - name: Lint with flake8
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-          # exit-zero treats all errors as warnings
-          flake8 . --format="::warning file=%(path)s,line=%(row)d,col=%(col)d::%(text)s" --exit-zero --max-complexity=10
+      - uses: chartboost/ruff-action@v1
 
-  lint-black:
+  lint-mypy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository at the current branch
         uses: actions/checkout@v2
       - name: Install dependencies
         uses: ./.github/actions/setup
-      - name: Lint with black
-        run: black --diff .
-
-  lint-pylint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repository at the current branch
-        uses: actions/checkout@v2
-      - name: Install dependencies
-        uses: ./.github/actions/setup
-      - name: Lint with pylint
-        run: pylint --msg-template='::warning file={path},line={line},col={column}::{msg}' */ || exit 0
-
-  lint-isort:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repository at the current branch
-        uses: actions/checkout@v2
-      - name: Install dependencies
-        uses: ./.github/actions/setup
-      - name: Lint with isort
-        run: isort --check --diff .
+      - name: Lint with mypy
+        run: mypy --strict .
 
   check-json:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.4.4
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: ["--fix", "--exit-non-zero-on-fix"]
+      # Run the formatter.
+      - id: ruff-format
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'v1.10.0'  # Use the sha / tag you want to point at
+    hooks:
+    -   id: mypy
+        args: [--strict, --ignore-missing-imports]

.vscode/extensions.json

@@ -1,9 +1,7 @@
 {
   "recommendations": [
-      "ms-python.black-formatter",
-      "ms-python.isort",
-      "ms-python.pylint",
-      "ms-python.python",
+      "charliermarsh.ruff",
+      "ms-python.mypy-type-checker",
       "ms-python.vscode-pylance",
   ]
 }

README.md

@@ -128,7 +128,7 @@ This cog displays the number of users banned in the guild with a random selectio
 - `[p]bancount` - Displays the total ban count using a randomly selected message.
 - `[p]bancount list` - Lists all the messages that can be used in the guild.
 - `[p]bancount add <message>` - Add a message to the guild list. Use `$ban` to insert the ban count in the message.
-- `[p]bancount remove <message index>` - Deletes (by index, from the list command) the message from the guild list. 
+- `[p]bancount remove <message index>` - Deletes (by index, from the list command) the message from the guild list.
 
 ### BetterPing
 
@@ -421,13 +421,12 @@ Copyright (c) 2018-2023 tigattack, contributors and original authors.
 The CI will fail unless your code is [PEP8](https://www.python.org/dev/peps/pep-0008/) compliant.
 
 ```bash
-pip install -r requirements-ci.txt
-isort . # This will fix the order of imports
-black . # This will auto-format and fix a lot of common mistakes
-pylint * # This will show general pep8-violations
+pip install -r requirements-dev.txt -r requirements.txt
+pre-commit install
+pre-commit run --all-files
 ```
 
-If you use [VSCode](https://code.visualstudio.com/) you can use the tasks integrated into the repo to locally run the same tasks as our CI
+If you use [VSCode](https://code.visualstudio.com/) you can use the [pre-commit-vscode](https://marketplace.visualstudio.com/items?itemName=MarkLarah.pre-commit-vscode) extension to auto generate tasks for the pre-commit hooks
 
 ### Making changes
 

pyproject.toml

@@ -1,37 +1,8 @@
-[tool.black]
-	line-length = 127
-	target-version = ["py38"]
-	exclude = "env"
-
-[tool.isort]
-	multi_line_output = 3
-	include_trailing_comma = true
-	force_grid_wrap = 0
-	use_parentheses = true
-	ensure_newline_before_comments = true
-	line_length = 127
-	skip = "env"
-	profile = "black"
-
-[tool.pylint.MASTER]
-	disable = [
-		"C0114", # Missing module docstring
-	]
-	max-attributes = 12
-	max-branches = 20
-
-[tool.pylint.FORMAT]
-	max-line-length = 127
-
-[tool.pylint.SIMILARITIES]
-	# Minimum lines number of a similarity.
-	min-similarity-lines = 10
-	# Ignore comments when computing similarities.
-	ignore-comments = "yes"
-	# Ignore docstrings when computing similarities.
-	ignore-docstrings = "yes"
-	# Ignore imports when computing similarities.
-	ignore-imports = "yes"
-
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+
+[tool.ruff.lint]
+select = ["F", "E", "W", "I", "ASYNC", "PL", "RUF"]
+
+[tool.ruff]
+line-length = 127

requirements-dev.txt

@@ -0,0 +1,3 @@
+pre-commit==3.7.0
+ruff==0.4.4
+mypy==1.10.0