chore(main): release 0.4.3 (#671)

Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.26.2 to 20.26.3.
- [Release notes](https://github.com/pypa/virtualenv/releases)
- [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst)
- [Commits](https://github.com/pypa/virtualenv/compare/20.26.2...20.26.3)

---
updated-dependencies:
- dependency-name: virtualenv
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -4,15 +4,23 @@ updates:
     directory: "/"
     schedule:
       interval: daily
+    commit-message:
+      prefix: ci
   - package-ecosystem: pip
     directory: "/.github/workflows"
     schedule:
       interval: daily
+    commit-message:
+      prefix: ci
   - package-ecosystem: pip
     directory: "/docs"
     schedule:
       interval: daily
+    commit-message:
+      prefix: docs
   - package-ecosystem: pip
     directory: "/"
     schedule:
       interval: daily
+    commit-message:
+      prefix: deps

.github/workflows/constraints.txt

@@ -1,7 +1,6 @@
-pip==23.0.1
+pip==24.1.1
-nox==2022.11.21
+nox==2024.4.15
-nox-poetry==1.0.2
+nox-poetry==1.0.3
-poetry==1.3.2
+poetry==1.8.3
-virtualenv==20.19.0
+virtualenv==20.26.3
-poetry-dynamic-versioning==0.21.3
 toml==0.10.2

.github/workflows/dependabot-auto-merge.yml

@@ -7,7 +7,7 @@ jobs:
   auto-merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ahmadnassri/action-dependabot-auto-merge@v2
         with:
           target: minor

.github/workflows/labeler.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
 
       - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@v4.1.0
+        uses: crazy-max/ghaction-github-labeler@v5.0.0
         with:
           skip-delete: true

.github/workflows/pre-release.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
       - name: Set up Python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: "3.10"
 
@@ -34,7 +34,7 @@ jobs:
           poetry build --ansi
 
       - name: Publish package on TestPyPI
-        uses: pypa/gh-action-pypi-publish@v1.6.4
+        uses: pypa/gh-action-pypi-publish@v1.9.0
         with:
           user: __token__
           password: ${{ secrets.TEST_PYPI_TOKEN }}

.github/workflows/release-please.yml

@@ -7,7 +7,7 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v3
+      - uses: google-github-actions/release-please-action@v4
         with:
           token: ${{ secrets.THIS_PAT }}
           release-type: python

.github/workflows/release.yml

@@ -8,32 +8,27 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/healthchecks-io
+    permissions:
+      id-token: write
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4.1.4
         with:
           fetch-depth: 2
       - name: Set up Python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v5.1.0
         with:
-          python-version: "3.10"
+          python-version: "3.11"
-
+      - name: Install pip and poetry
-      - name: Upgrade pip
         run: |
-          pip install --constraint=.github/workflows/constraints.txt pip
+          pip install --upgrade --constraint .github/workflows/constraints.txt pip poetry
           pip --version
-
-      - name: Install Poetry
-        run: |
-          pip install --constraint=.github/workflows/constraints.txt poetry poetry-dynamic-versioning
           poetry --version
-
       - name: Build package
         run: |
-          poetry build --ansi
+          poetry build
-
+      - name: Publish package distributions to PyPI
-      - name: Publish package on PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
-        uses: pypa/gh-action-pypi-publish@v1.6.4
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}

.github/workflows/tests.yml

@@ -11,22 +11,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { python: "3.10", os: "ubuntu-latest", session: "pre-commit" }
+          - { python: "3.11", os: "ubuntu-latest", session: "pre-commit" }
-          - { python: "3.10", os: "ubuntu-latest", session: "safety" }
+          - { python: "3.11", os: "ubuntu-latest", session: "safety" }
-          # - { python: "3.10", os: "ubuntu-latest", session: "mypy" }
+          - { python: "3.12", os: "ubuntu-latest", session: "tests" }
-          # - { python: "3.9", os: "ubuntu-latest", session: "mypy" }
-          # - { python: "3.8", os: "ubuntu-latest", session: "mypy" }
-          # - { python: "3.7", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.11", os: "ubuntu-latest", session: "tests" }
           - { python: "3.10", os: "ubuntu-latest", session: "tests" }
           - { python: "3.9", os: "ubuntu-latest", session: "tests" }
           - { python: "3.8", os: "ubuntu-latest", session: "tests" }
-          - { python: "3.7", os: "ubuntu-latest", session: "tests" }
+          - { python: "3.11", os: "ubuntu-latest", session: "xdoctest" }
-          # poetry fails to install on windows
+          - { python: "3.11", os: "ubuntu-latest", session: "docs-build" }
-          # - { python: "3.10", os: "windows-latest", session: "tests" }
-          - { python: "3.11", os: "macos-latest", session: "tests" }
-          - { python: "3.10", os: "ubuntu-latest", session: "xdoctest" }
-          - { python: "3.10", os: "ubuntu-latest", session: "docs-build" }
 
     env:
       NOXSESSION: ${{ matrix.session }}
@@ -35,37 +28,19 @@ jobs:
 
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python }}
 
-      - name: Upgrade pip
+      - name: Install needed tools
         run: |
-          pip install --constraint=.github/workflows/constraints.txt pip
+          pip install --upgrade pip nox poetry virtualenv toml --constraint=.github/workflows/constraints.txt
           pip --version
-
+          # separate out nox-poetry until it gets a released version with support for 1.8
-      - name: Upgrade pip in virtual environments
+          pip install --upgrade nox-poetry --constraint=.github/workflows/constraints.txt
-        shell: python
-        run: |
-          import os
-          import pip
-
-          with open(os.environ["GITHUB_ENV"], mode="a") as io:
-              print(f"VIRTUALENV_PIP={pip.__version__}", file=io)
-
-      - name: Install Poetry
-        run: |
-          pipx install --pip-args=--constraint=.github/workflows/constraints.txt poetry
-          poetry --version
-
-      - name: Install Nox
-        run: |
-          pipx install --pip-args=--constraint=.github/workflows/constraints.txt nox
-          pipx inject --pip-args=--constraint=.github/workflows/constraints.txt nox nox-poetry toml
-          nox --version
 
       - name: Compute pre-commit cache key
         if: matrix.session == 'pre-commit'
@@ -85,7 +60,7 @@ jobs:
             fh.write(f"result={result}\n")
 
       - name: Restore pre-commit cache
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v4.0.2
         if: matrix.session == 'pre-commit'
         with:
           path: ~/.cache/pre-commit
@@ -96,32 +71,3 @@ jobs:
       - name: Run Nox
         run: |
           nox --force-color --python=${{ matrix.python }}
-
-      - name: Upload coverage data
-        if: always() && matrix.session == 'tests'
-        uses: "actions/upload-artifact@v3.1.2"
-        with:
-          name: coverage-data
-          path: ".coverage.*"
-
-      - name: Upload documentation
-        if: matrix.session == 'docs-build'
-        uses: actions/upload-artifact@v3.1.2
-        with:
-          name: docs
-          path: docs/_build
-
-  coverage:
-    runs-on: ubuntu-latest
-    needs: tests
-    steps:
-      - name: Download coverage data
-        uses: actions/download-artifact@v3.0.2
-        with:
-          name: coverage-data
-
-      - name: Upload coverage report
-        uses: codecov/codecov-action@v3.1.1
-        with:
-          files: .coverage.xml
-          verbose: true

.pre-commit-config.yaml

@@ -1,11 +1,26 @@
+exclude: ".*tests\/fixtures.*"
 repos:
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
+  - repo: https://github.com/pre-commit/pre-commit-hooks
-    # Ruff version.
+    rev: v4.6.0
-    rev: "v0.0.249"
     hooks:
+      - id: check-yaml
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.4.3
+    hooks:
+      # Run the linter.
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: [ --fix ]
-        types: [python]
+      # Run the formatter.
+      - id: ruff-format
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.6.27
+    hooks:
+      - id: actionlint-docker
+        name: Actionlint
   - repo: local
     hooks:
       - id: bandit
@@ -14,7 +29,7 @@ repos:
         language: system
         types: [python]
         require_serial: true
-        args: ["-c", "bandit.yml"]
+        args: ["-c", "pyproject.toml"]
       - id: check-added-large-files
         name: Check for added large files
         entry: check-added-large-files
@@ -41,24 +56,10 @@ repos:
         entry: pyupgrade
         language: system
         types: [python]
-        args: [--py37-plus]
+        args: [--py38-plus]
-      - id: reorder-python-imports
-        name: Reorder python imports
-        entry: reorder-python-imports
-        language: system
-        types: [python]
-        args: [--application-directories=src]
       - id: trailing-whitespace
         name: Trim Trailing Whitespace
         entry: trailing-whitespace-fixer
         language: system
         types: [text]
         stages: [commit, push, manual]
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
-    hooks:
-      - id: prettier
-  - repo: https://github.com/rhysd/actionlint
-    rev: v1.6.15
-    hooks:
-      - id: actionlint-docker

CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## [0.4.3](https://github.com/andrewthetechie/py-healthchecks.io/compare/v0.4.2...v0.4.3) (2024-07-03)
+
+
+### Dependencies
+
+* bump coverage from 7.5.1 to 7.5.2 ([#680](https://github.com/andrewthetechie/py-healthchecks.io/issues/680)) ([b372e66](https://github.com/andrewthetechie/py-healthchecks.io/commit/b372e66c44ae403af042a43b3d7de41142570eb3))
+* bump coverage from 7.5.2 to 7.5.3 ([#683](https://github.com/andrewthetechie/py-healthchecks.io/issues/683)) ([5325352](https://github.com/andrewthetechie/py-healthchecks.io/commit/5325352bae60b332f4602e37adb3f35cc8ae11c7))
+* bump httpx from 0.24.1 to 0.27.0 ([#668](https://github.com/andrewthetechie/py-healthchecks.io/issues/668)) ([6e88834](https://github.com/andrewthetechie/py-healthchecks.io/commit/6e88834d93ea28f9bfeb7b81bcac8227ee38580c))
+* bump pre-commit from 2.21.0 to 3.5.0 ([#669](https://github.com/andrewthetechie/py-healthchecks.io/issues/669)) ([4d00499](https://github.com/andrewthetechie/py-healthchecks.io/commit/4d00499f94c7e6ad4af86742996fca9c266e8ddf))
+* bump pytz from 2023.4 to 2024.1 ([#670](https://github.com/andrewthetechie/py-healthchecks.io/issues/670)) ([67ec0b5](https://github.com/andrewthetechie/py-healthchecks.io/commit/67ec0b5d58563c0fb92ee5a7754706b07d767c11))
+* bump reorder-python-imports from 3.12.0 to 3.13.0 ([#685](https://github.com/andrewthetechie/py-healthchecks.io/issues/685)) ([c071ced](https://github.com/andrewthetechie/py-healthchecks.io/commit/c071ced5bfc00fcfef922d01a3c70961f03176d6))
+* bump ruff from 0.4.3 to 0.4.4 ([#675](https://github.com/andrewthetechie/py-healthchecks.io/issues/675)) ([e46f70c](https://github.com/andrewthetechie/py-healthchecks.io/commit/e46f70c4708eb703c0f02a97efe62a94145f6e58))
+* bump ruff from 0.4.4 to 0.4.5 ([#679](https://github.com/andrewthetechie/py-healthchecks.io/issues/679)) ([55ea01d](https://github.com/andrewthetechie/py-healthchecks.io/commit/55ea01de63c43865c0b41b4248f02d96b17f1c07))
+* bump ruff from 0.4.5 to 0.4.6 ([#681](https://github.com/andrewthetechie/py-healthchecks.io/issues/681)) ([627f070](https://github.com/andrewthetechie/py-healthchecks.io/commit/627f070e3fcbaf53a523a5b81b0699e39ffc4229))
+* bump ruff from 0.4.6 to 0.5.0 ([#699](https://github.com/andrewthetechie/py-healthchecks.io/issues/699)) ([f9e0fd0](https://github.com/andrewthetechie/py-healthchecks.io/commit/f9e0fd0bd135621f031ed5d490cfabdd90c8991d))
+* bump the pip group with 3 updates ([#694](https://github.com/andrewthetechie/py-healthchecks.io/issues/694)) ([a4b7396](https://github.com/andrewthetechie/py-healthchecks.io/commit/a4b73966f1b44c609bd9bdd25505429bb8b772a8))
+* bump types-pytz from 2023.4.0.20240130 to 2024.1.0.20240417 ([#672](https://github.com/andrewthetechie/py-healthchecks.io/issues/672)) ([e24fcb2](https://github.com/andrewthetechie/py-healthchecks.io/commit/e24fcb233bd7a35f3999e9fb7bd174ef357ecdcb))
+
+## [0.4.2](https://github.com/andrewthetechie/py-healthchecks.io/compare/v0.4.1...v0.4.2) (2024-05-07)
+
+
+### Dependencies
+
+* bump croniter from 1.4.1 to 2.0.5 ([#660](https://github.com/andrewthetechie/py-healthchecks.io/issues/660)) ([f945389](https://github.com/andrewthetechie/py-healthchecks.io/commit/f94538951c0aed4b0528974d6cb29c4cfd859845))
+* bump pytest-cov from 4.1.0 to 5.0.0 ([#663](https://github.com/andrewthetechie/py-healthchecks.io/issues/663)) ([802520d](https://github.com/andrewthetechie/py-healthchecks.io/commit/802520d4548d70e5597321e02b8d11af322431bd))
+* bump safety from 2.3.5 to 3.2.0 ([#661](https://github.com/andrewthetechie/py-healthchecks.io/issues/661)) ([c56e048](https://github.com/andrewthetechie/py-healthchecks.io/commit/c56e048635d32eb9cf5c4f82a9929e9065da5735))
+* bump sphinx from 5.3.0 to 7.1.2 ([#662](https://github.com/andrewthetechie/py-healthchecks.io/issues/662)) ([97723e9](https://github.com/andrewthetechie/py-healthchecks.io/commit/97723e91b631e3c4266a090e169eb19ffe1de153))
+
+
+### Documentation
+
+* bump furo from 2024.4.27 to 2024.5.6 in /docs ([#665](https://github.com/andrewthetechie/py-healthchecks.io/issues/665)) ([b7438af](https://github.com/andrewthetechie/py-healthchecks.io/commit/b7438af1275ce8fceb5d996aabd28cce5ca1193c))
+
+## [0.4.1](https://github.com/andrewthetechie/py-healthchecks.io/compare/v0.4.0...v0.4.1) (2024-05-05)
+
+
+### Bug Fixes
+
+* update poetry and virtualenv ([#489](https://github.com/andrewthetechie/py-healthchecks.io/issues/489)) ([1376595](https://github.com/andrewthetechie/py-healthchecks.io/commit/1376595877577848e0672d88403dc5740e7c1664))
+
+
+### Dependencies
+
+* bump pytest-asyncio from 0.21.2 to 0.23.6 ([#657](https://github.com/andrewthetechie/py-healthchecks.io/issues/657)) ([f785186](https://github.com/andrewthetechie/py-healthchecks.io/commit/f7851865821ed0f6df4d4977a4e3a5bc26bbf190))
+* bump ruff from 0.0.275 to 0.4.3 ([#655](https://github.com/andrewthetechie/py-healthchecks.io/issues/655)) ([6de87bb](https://github.com/andrewthetechie/py-healthchecks.io/commit/6de87bb43d2c236f1be762d439998baea5d0c417))
+* bump types-croniter from 1.4.0.1 to 2.0.0.20240423 ([#654](https://github.com/andrewthetechie/py-healthchecks.io/issues/654)) ([50f8bba](https://github.com/andrewthetechie/py-healthchecks.io/commit/50f8bbabb2df6aed0931ca5979792e694121650c))
+
+
+### Documentation
+
+* fixes get_check args ([#597](https://github.com/andrewthetechie/py-healthchecks.io/issues/597)) ([cb862fa](https://github.com/andrewthetechie/py-healthchecks.io/commit/cb862fa2c576b62dee2661a2939f69548726bc11))
+
 ## [0.4.0](https://github.com/andrewthetechie/py-healthchecks.io/compare/v0.3.1...v0.4.0) (2023-02-21)
 
 

docs/conf.py

@@ -1,4 +1,5 @@
 """Sphinx configuration."""
+
 from datetime import datetime
 
 

docs/requirements.txt

@@ -1,2 +1,2 @@
-furo==2022.12.7
+furo==2024.5.6
-sphinx==6.1.3
+sphinx==7.3.7

docs/usage.rst

@@ -75,7 +75,7 @@ Getting a Check
 
     client = Client(api_key="myapikey")
 
-    check = client.get_check(uuid="mychecksuuid")
+    check = client.get_check(check_id="mychecksuuid")
     print(check)
 
 Pinging a Check

noxfile.py

@@ -1,4 +1,5 @@
 """Nox sessions."""
+
 import os
 import shlex
 import shutil
@@ -23,28 +24,17 @@ except ImportError:
 
 
 package = "healthchecks_io"
-python_versions = ["3.10", "3.11", "3.9", "3.8", "3.7"]
+python_versions = ["3.11", "3.12", "3.10", "3.9", "3.8"]
 nox.needs_version = ">= 2021.6.6"
 nox.options.sessions = (
     "pre-commit",
-    "bandit",
     "safety",
-    "mypy",
+    # "mypy",
     "tests",
-    # "typeguard",
     "xdoctest",
     "docs-build",
 )
-mypy_type_packages = ("types-croniter", "types-pytz")
+
-test_requirements = (
-    "coverage[toml]",
-    "pytest",
-    "pygments",
-    "respx",
-    "pytest-asyncio",
-    "pytest-lazy-fixture",
-)
-mypy_type_packages = ()
 pyproject = toml.load("pyproject.toml")
 test_requirements = pyproject["tool"]["poetry"]["group"]["dev"]["dependencies"].keys()
 
@@ -118,20 +108,7 @@ def activate_virtualenv_in_precommit_hooks(session: Session) -> None:
 def precommit(session: Session) -> None:
     """Lint using pre-commit."""
     args = session.posargs or ["run", "--all-files", "--show-diff-on-failure"]
-    session.install(
+    session.install(*test_requirements)
-        "black",
-        "darglint",
-        "flake8",
-        "flake8-bandit",
-        "flake8-bugbear",
-        "flake8-docstrings",
-        "flake8-rst-docstrings",
-        "pep8-naming",
-        "pre-commit",
-        "pre-commit-hooks",
-        "pyupgrade",
-        "reorder-python-imports",
-    )
     session.run("pre-commit", *args)
     if args and args[0] == "install":
         activate_virtualenv_in_precommit_hooks(session)
@@ -144,7 +121,11 @@ def safety(session: Session) -> None:
     session.install("safety")
     # ignore https://github.com/pytest-dev/py/issues/287
     # its an irresposnbily filed CVE causing nose
-    session.run("safety", "check", "--full-report", f"--file={requirements}", "--ignore=51457")
+    # ignore https://data.safetycli.com/v/70612/97c/
+    # Jinja2 vulnerability, maintainer believe it is not a valid vulnerability
+    # ignore https://data.safetycli.com/v/71064/97c/
+    # requests vulnerability. The fixed version is not compatible with the packaging library
+    session.run("safety", "check", "--full-report", f"--file={requirements}", "--ignore=51457,70612,71064")
 
 
 @session(python=python_versions)
@@ -153,17 +134,10 @@ def mypy(session: Session) -> None:
     args = session.posargs or ["src"]
     session.install(".")
     session.install("mypy", "pytest")
-    session.install(*mypy_type_packages)
+    session.install(*test_requirements)
     session.run("mypy", *args)
 
 
-@session(python=python_versions[0])
-def bandit(session: Session) -> None:
-    """Run bandit security tests"""
-    args = session.posargs or ["-r", "./src"]
-    session.run("bandit", *args)
-
-
 @session(python=python_versions)
 def tests(session: Session) -> None:
     """Run the test suite."""

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "healthchecks_io"
-version = "0.4.0"
+version = "0.4.3"
 description = "A python client package for Healthchecks.io API"
 authors = ["Andrew Herrington <andrew.the.techie@gmail.com>"]
 license = "MIT"
@@ -25,34 +25,35 @@ classifiers = [
 Changelog = "https://github.com/andrewthetechie/py-healthchecks.io/releases"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
-pydantic = "^1.9.1"
+pydantic = ">=1.9.1,<3.0.0"
-httpx = ">=0.23.0,<0.24.0"
+httpx = ">=0.23.0,<0.28.0"
-croniter = "^1.1.0"
+croniter = ">=1.1,<3.0"
-pytz = ">=2021.3,<2023.0"
+pytz = ">=2024.1,<2025.0"
+packaging = "^24.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.2.1"
 coverage = {extras = ["toml"], version = "^7.1"}
-safety = "^2.3.5"
+safety = ">=2.3.5,<4.0.0"
 mypy = "^1.0"
 xdoctest = {extras = ["colors"], version = "^1.1.1"}
-sphinx = "^4.3.2"
+sphinx = ">=4.3.2,<8.0.0"
 sphinx-autobuild = ">=2021.3.14"
-pre-commit = "^2.21.0"
+pre-commit = ">=2.21,<4.0"
 reorder-python-imports = "^3.9.0"
 pre-commit-hooks = "^4.4.0"
 pyupgrade = "^3.3.1"
 furo = ">=2021.11.12"
-pytest-cov = "^4.0.0"
+pytest-cov = ">=4,<6"
-types-croniter = "^1.3.2"
+types-croniter = ">=1.3.2,<3.0.0"
-types-pytz = "^2022.7.1"
+types-pytz = ">=2022.7.1,<2025.0.0"
-pytest-asyncio = "^0.20.3"
+pytest-asyncio = ">=0.20.3,<0.24.0"
-respx = "^0.20.1"
+respx = ">=0.20.1,<0.22.0"
 pytest-mock = "^3.10.0"
 pytest-lazy-fixture = "^0.6.3"
 pytest-xdist = "^3.2.0"
-ruff = "^0.0.249"
+ruff = ">=0.5.0,<0.5.1"
 bandit = "^1.7.4"
 
 [tool.coverage.paths]
@@ -67,6 +68,9 @@ source = ["healthchecks_io"]
 show_missing = true
 fail_under = 100
 
+[tool.bandit]
+exclude_dirs = ["tests", "noxfile.py", ".github/scripts", "test_errbot", "dist"]
+
 [tool.mypy]
 strict = true
 warn_unreachable = true
@@ -76,7 +80,7 @@ show_error_codes = true
 show_error_context = true
 
 [build-system]
-requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning"]
+requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.pytest.ini_options]
@@ -84,4 +88,4 @@ addopts = "-n 4 --ignore examples --cov=healthchecks_io --cov-report xml:.covera
 
 [tool.ruff]
 line-length = 120
-target-version = "py37"
+target-version = "py38"

src/healthchecks_io/__init__.py

@@ -1,6 +1,7 @@
 """Py Healthchecks.Io."""
+
 # set by poetry-dynamic-versioning
-__version__ = "0.4.0"  # noqa: E402
+__version__ = "0.4.3"  # noqa: E402
 
 from .client import AsyncClient  # noqa: F401, E402
 from .client import Client  # noqa: F401, E402

src/healthchecks_io/client/__init__.py

@@ -1,4 +1,5 @@
 """healthchecks_io clients."""
+
 from .async_client import AsyncClient  # noqa: F401
 from .check_trap import CheckTrap  # noqa: F401
 from .sync_client import Client  # noqa: F401

src/healthchecks_io/client/_abstract.py

@@ -57,9 +57,7 @@ class AbstractClient(ABC):
         """Finalizer method is called by weakref.finalize when the object is dereferenced to do cleanup of clients."""
         pass
 
-    def _get_api_request_url(
+    def _get_api_request_url(self, path: str, params: Optional[Dict[str, Any]] = None) -> str:
-        self, path: str, params: Optional[Dict[str, Any]] = None
-    ) -> str:
         """Get a full request url for the healthchecks api.
 
         Args:
@@ -165,9 +163,7 @@ class AbstractClient(ABC):
             raise CheckNotFoundError(f"CHeck not found at {response.request.url}")
 
         if response.status_code == 400:
-            raise BadAPIRequestError(
+            raise BadAPIRequestError(f"Bad request when requesting {response.request.url}. {response.text}")
-                f"Bad request when requesting {response.request.url}. {response.text}"
-            )
 
         return response
 
@@ -208,21 +204,15 @@ class AbstractClient(ABC):
             raise HCAPIRateLimitError(f"Rate limited on {response.request.url}")
 
         if response.status_code == 400:
-            raise BadAPIRequestError(
+            raise BadAPIRequestError(f"Bad request when requesting {response.request.url}. {response.text}")
-                f"Bad request when requesting {response.request.url}. {response.text}"
-            )
 
         if response.status_code == 409:
-            raise NonUniqueSlugError(
+            raise NonUniqueSlugError(f"Bad request, slug conflict {response.request.url}. {response.text}")
-                f"Bad request, slug conflict {response.request.url}. {response.text}"
-            )
 
         return response
 
     @staticmethod
-    def _add_url_params(
+    def _add_url_params(url: str, params: Dict[str, Union[str, int, bool]], replace: bool = True) -> str:
-        url: str, params: Dict[str, Union[str, int, bool]], replace: bool = True
-    ) -> str:
         """Add GET params to provided URL being aware of existing.
 
         :param url: string of target URL
@@ -255,12 +245,7 @@ class AbstractClient(ABC):
             # get all the duplicated keys from params and urlencode them, we'll concat this to the params string later
             duplicated_params = [x for x in params if x in parsed_get_args]
             # get all the args that aren't duplicated and add them to parsed_get_args
-            parsed_get_args.update(
+            parsed_get_args.update({key: parsed_params[key] for key in [x for x in params if x not in parsed_get_args]})
-                {
-                    key: parsed_params[key]
-                    for key in [x for x in params if x not in parsed_get_args]
-                }
-            )
             # if we have any duplicated parameters, urlencode them, we append them later
             extra_parameters = (
                 f"&{urlencode({key: params[key] for key in duplicated_params}, doseq=True)}"

src/healthchecks_io/client/async_client.py

@@ -1,4 +1,5 @@
 """An async healthchecks.io client."""
+
 import asyncio
 from types import TracebackType
 from typing import Dict

src/healthchecks_io/client/check_trap.py

@@ -1,4 +1,5 @@
 """CheckTrap is a context manager to wrap around python code to communicate results to a Healthchecks check."""
+
 from types import TracebackType
 from typing import List
 from typing import Optional
@@ -68,9 +69,7 @@ class CheckTrap:
             CheckTrap: self
         """
         if isinstance(self.client, AsyncClient):
-            raise WrongClientError(
+            raise WrongClientError("You passed an AsyncClient, use this as an async context manager")
-                "You passed an AsyncClient, use this as an async context manager"
-            )
         result = self.client.start_ping(uuid=self.uuid, slug=self.slug)
         if not result[0]:
             raise PingFailedError(result[1])
@@ -96,9 +95,7 @@ class CheckTrap:
             Optional[bool]: self.suppress_exceptions, if true will not raise any exceptions
         """
         if exc_type is None:
-            self.client.success_ping(
+            self.client.success_ping(self.uuid, self.slug, data="\n".join(self.log_lines))
-                self.uuid, self.slug, data="\n".join(self.log_lines)
-            )
         else:
             self.add_log(str(exc))
             self.add_log(str(traceback))
@@ -125,9 +122,7 @@ class CheckTrap:
             CheckTrap: self
         """
         if isinstance(self.client, Client):
-            raise WrongClientError(
+            raise WrongClientError("You passed a sync Client, use this as a regular context manager")
-                "You passed a sync Client, use this as a regular context manager"
-            )
         result = await self.client.start_ping(self.uuid, self.slug)
         if not result[0]:
             raise PingFailedError(result[1])

src/healthchecks_io/client/sync_client.py

@@ -1,4 +1,5 @@
 """An async healthchecks.io client."""
+
 from types import TracebackType
 from typing import Dict
 from typing import List
@@ -301,6 +302,7 @@ class Client(AbstractClient):
 
         svg, json, shields: reports two states: "up" and "down". It considers any checks in the grace period
             as still "up".
+
         svg3, json3, shields3: reports three states: "up", "late", and "down".
 
         The response includes a special * entry: this pseudo-tag reports the overal status

src/healthchecks_io/schemas/__init__.py

@@ -1,4 +1,5 @@
 """Schemas for healthchecks_io."""
+
 from .badges import Badges
 from .checks import Check
 from .checks import CheckCreate

src/healthchecks_io/schemas/badges.py

@@ -2,6 +2,7 @@
 
 https://healthchecks.io/docs/api/
 """
+
 from typing import Dict
 
 from pydantic import BaseModel

src/healthchecks_io/schemas/checks.py

@@ -2,6 +2,7 @@
 
 https://healthchecks.io/docs/api/
 """
+
 from datetime import datetime
 from pathlib import PurePath
 from typing import Any
@@ -13,45 +14,45 @@ from urllib.parse import urlparse
 
 import pytz
 from croniter import croniter
-from pydantic import BaseModel
+from pydantic import field_validator, BaseModel, ValidationInfo
 from pydantic import Field
-from pydantic import validator
 
 
 class Check(BaseModel):
     """Schema for a check object, either from a readonly api request or a rw api request."""
 
-    unique_key: Optional[str]
+    unique_key: Optional[str] = None
     name: str
     slug: str
-    tags: Optional[str]
+    tags: Optional[str] = None
-    desc: Optional[str]
+    desc: Optional[str] = None
     grace: int
     n_pings: int
     status: str
-    last_ping: Optional[datetime]
+    last_ping: Optional[datetime] = None
-    next_ping: Optional[datetime]
+    next_ping: Optional[datetime] = None
     manual_resume: bool
-    methods: Optional[str]
+    methods: Optional[str] = None
     # healthchecks.io's api doesn't return a scheme so we cant use Pydantic AnyUrl here
-    ping_url: Optional[str]
+    ping_url: Optional[str] = None
-    update_url: Optional[str]
+    update_url: Optional[str] = None
-    pause_url: Optional[str]
+    pause_url: Optional[str] = None
-    channels: Optional[str]
+    channels: Optional[str] = None
-    timeout: Optional[int]
+    timeout: Optional[int] = None
-    uuid: Optional[str]
+    uuid: Optional[str] = Field(default=None, validate_default=True)
 
-    @validator("uuid", always=True)
+    @field_validator("uuid")
-    def validate_uuid(cls, value: Optional[str], values: Dict[str, Any]) -> Optional[str]:  # noqa: B902
+    @classmethod
+    def validate_uuid(cls, value: Optional[str], info: ValidationInfo) -> Optional[str]:  # noqa: B902
         """Tries to set the uuid from the ping_url.
 
         Will return none if a read only token is used because it cannot retrieve the UUID of a check
         """
-        if value is None and values.get("ping_url", None) is not None:
+        if value is None and info.data.get("ping_url", None) is not None:
             # url is like healthchecks.io/ping/8f57b84b-86c2-4546-8923-03f83d27604a, so we want just the
             # UUID off the end
             # Parse the url, grab the path and then just get the name using pathlib
-            path = PurePath(str(urlparse(values.get("ping_url")).path))
+            path = PurePath(str(urlparse(info.data.get("ping_url")).path))
             return path.name
         return value
 
@@ -88,8 +89,7 @@ class CheckCreate(BaseModel):
     )
     tz: Optional[str] = Field(
         "UTC",
-        description="Server's timezone. This setting only has an effect "
+        description="Server's timezone. This setting only has an effect " "in combination with the schedule parameter.",
-        "in combination with the schedule parameter.",
     )
     manual_resume: Optional[bool] = Field(
         False,
@@ -126,28 +126,32 @@ class CheckCreate(BaseModel):
         "for the unique field are name, tags, timeout, and grace.",
     )
 
-    @validator("schedule")
+    @field_validator("schedule")
+    @classmethod
     def validate_schedule(cls, value: str) -> str:
         """Validates that the schedule is a valid cron expression."""
         if not croniter.is_valid(value):
             raise ValueError("Schedule is not a valid cron expression")
         return value
 
-    @validator("tz")
+    @field_validator("tz")
+    @classmethod
     def validate_tz(cls, value: str) -> str:
         """Validates that the timezone is a valid timezone string."""
         if value not in pytz.all_timezones:
             raise ValueError("Tz is not a valid timezone")
         return value
 
-    @validator("methods")
+    @field_validator("methods")
+    @classmethod
     def validate_methods(cls, value: str) -> str:
         """Validate that methods."""
         if value not in ("", "POST"):
             raise ValueError("Methods is invalid, it should be either an empty string or POST")
         return value
 
-    @validator("unique")
+    @field_validator("unique")
+    @classmethod
     def validate_unique(cls, value: List[Optional[str]]) -> List[Optional[str]]:
         """Validate unique list."""
         for unique in value:
@@ -184,8 +188,7 @@ class CheckUpdate(CheckCreate):
     )
     tz: Optional[str] = Field(
         None,
-        description="Server's timezone. This setting only has an effect "
+        description="Server's timezone. This setting only has an effect " "in combination with the schedule parameter.",
-        "in combination with the schedule parameter.",
     )
     manual_resume: Optional[bool] = Field(
         None,

src/healthchecks_io/schemas/integrations.py

@@ -2,6 +2,7 @@
 
 https://healthchecks.io/docs/api/
 """
+
 from typing import Dict
 
 from pydantic import BaseModel

tests/client/test_abstract.py

@@ -13,10 +13,7 @@ from healthchecks_io import NonUniqueSlugError
 
 
 def test_abstract_add_url_params(test_abstract_client):
-
+    url = test_abstract_client._add_url_params("http://test.com/?test=test", {"test": "test2"})
-    url = test_abstract_client._add_url_params(
-        "http://test.com/?test=test", {"test": "test2"}
-    )
     assert url == "http://test.com/?test=test2"
 
 

tests/client/test_async.py

@@ -15,9 +15,7 @@ from healthchecks_io.client.exceptions import HCAPIError
 
 @pytest.mark.asyncio
 @pytest.mark.respx
-async def test_acreate_check_200_context_manager(
+async def test_acreate_check_200_context_manager(fake_check_api_result, respx_mock, test_async_client):
-    fake_check_api_result, respx_mock, test_async_client
-):
     checks_url = urljoin(test_async_client._api_url, "checks/")
     respx_mock.post(checks_url).mock(
         return_value=Response(
@@ -43,9 +41,7 @@ async def test_acreate_check_200_context_manager(
         )
     )
     async with test_async_client as test_client:
-        check = await test_client.create_check(
+        check = await test_client.create_check(CheckCreate(name="test", tags="test", desc="test"))
-            CheckCreate(name="test", tags="test", desc="test")
-        )
     assert check.name == "Backups"
 
 
@@ -76,9 +72,7 @@ async def test_acreate_check_200(fake_check_api_result, respx_mock, test_async_c
             },
         )
     )
-    check = await test_async_client.create_check(
+    check = await test_async_client.create_check(CheckCreate(name="test", tags="test", desc="test"))
-        CheckCreate(name="test", tags="test", desc="test")
-    )
     assert check.name == "Backups"
 
 
@@ -109,9 +103,7 @@ async def test_aupdate_check_200(fake_check_api_result, respx_mock, test_async_c
             },
         )
     )
-    check = await test_async_client.update_check(
+    check = await test_async_client.update_check("test", CheckUpdate(name="test", desc="test"))
-        "test", CheckUpdate(name="test", desc="test")
-    )
     assert check.name == "Backups"
 
 
@@ -120,9 +112,7 @@ async def test_aupdate_check_200(fake_check_api_result, respx_mock, test_async_c
 async def test_aget_checks_200(fake_check_api_result, respx_mock, test_async_client):
     assert test_async_client._client is not None
     checks_url = urljoin(test_async_client._api_url, "checks/")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json={"checks": [fake_check_api_result]}))
-        return_value=Response(status_code=200, json={"checks": [fake_check_api_result]})
-    )
     checks = await test_async_client.get_checks()
     assert len(checks) == 1
     assert checks[0].name == fake_check_api_result["name"]
@@ -132,13 +122,9 @@ async def test_aget_checks_200(fake_check_api_result, respx_mock, test_async_cli
 @pytest.mark.respx
 async def test_aget_checks_pass_in_client(fake_check_api_result, respx_mock):
     httpx_client = HTTPXAsyncClient()
-    test_async_client = AsyncClient(
+    test_async_client = AsyncClient(api_key="test", api_url="http://localhost/api/", client=httpx_client)
-        api_key="test", api_url="http://localhost/api/", client=httpx_client
-    )
     checks_url = urljoin(test_async_client._api_url, "checks/")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json={"checks": [fake_check_api_result]}))
-        return_value=Response(status_code=200, json={"checks": [fake_check_api_result]})
-    )
     checks = await test_async_client.get_checks()
     assert len(checks) == 1
     assert checks[0].name == fake_check_api_result["name"]
@@ -146,9 +132,7 @@ async def test_aget_checks_pass_in_client(fake_check_api_result, respx_mock):
 
 @pytest.mark.asyncio
 @pytest.mark.respx
-async def test_aget_checks_exceptions(
+async def test_aget_checks_exceptions(fake_check_api_result, respx_mock, test_async_client):
-    fake_check_api_result, respx_mock, test_async_client
-):
     checks_url = urljoin(test_async_client._api_url, "checks/")
     # test exceptions
     respx_mock.get(checks_url).mock(return_value=Response(status_code=401))
@@ -186,9 +170,7 @@ def test_finalizer_closes(test_async_client):
 async def test_aget_check_200(fake_check_api_result, respx_mock, test_async_client):
     assert test_async_client._client is not None
     checks_url = urljoin(test_async_client._api_url, "checks/test")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json=fake_check_api_result))
-        return_value=Response(status_code=200, json=fake_check_api_result)
-    )
     check = await test_async_client.get_check(check_id="test")
     assert check.name == fake_check_api_result["name"]
 
@@ -207,9 +189,7 @@ async def test_acheck_get_404(respx_mock, test_async_client):
 @pytest.mark.respx
 async def test_pause_check_200(fake_check_api_result, respx_mock, test_async_client):
     checks_url = urljoin(test_async_client._api_url, "checks/test/pause")
-    respx_mock.post(checks_url).mock(
+    respx_mock.post(checks_url).mock(return_value=Response(status_code=200, json=fake_check_api_result))
-        return_value=Response(status_code=200, json=fake_check_api_result)
-    )
     check = await test_async_client.pause_check(check_id="test")
     assert check.name == fake_check_api_result["name"]
 
@@ -229,9 +209,7 @@ async def test_acheck_pause_404(respx_mock, test_async_client):
 async def test_adelete_check_200(fake_check_api_result, respx_mock, test_async_client):
     assert test_async_client._client is not None
     checks_url = urljoin(test_async_client._api_url, "checks/test")
-    respx_mock.delete(checks_url).mock(
+    respx_mock.delete(checks_url).mock(return_value=Response(status_code=200, json=fake_check_api_result))
-        return_value=Response(status_code=200, json=fake_check_api_result)
-    )
     check = await test_async_client.delete_check(check_id="test")
     assert check.name == fake_check_api_result["name"]
 
@@ -247,15 +225,9 @@ async def test_adelete_pause404(respx_mock, test_async_client):
 
 @pytest.mark.asyncio
 @pytest.mark.respx
-async def test_aget_check_pings_200(
+async def test_aget_check_pings_200(fake_check_pings_api_result, respx_mock, test_async_client):
-    fake_check_pings_api_result, respx_mock, test_async_client
-):
     checks_url = urljoin(test_async_client._api_url, "checks/test/pings/")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json={"pings": fake_check_pings_api_result}))
-        return_value=Response(
-            status_code=200, json={"pings": fake_check_pings_api_result}
-        )
-    )
     pings = await test_async_client.get_check_pings("test")
     assert len(pings) == len(fake_check_pings_api_result)
     assert pings[0].type == fake_check_pings_api_result[0]["type"]
@@ -263,13 +235,9 @@ async def test_aget_check_pings_200(
 
 @pytest.mark.asyncio
 @pytest.mark.respx
-async def test_aget_check_flips_200(
+async def test_aget_check_flips_200(fake_check_flips_api_result, respx_mock, test_async_client):
-    fake_check_flips_api_result, respx_mock, test_async_client
-):
     checks_url = urljoin(test_async_client._api_url, "checks/test/flips/")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json=fake_check_flips_api_result))
-        return_value=Response(status_code=200, json=fake_check_flips_api_result)
-    )
     flips = await test_async_client.get_check_flips("test")
     assert len(flips) == len(fake_check_flips_api_result)
     assert flips[0].up == fake_check_flips_api_result[0]["up"]
@@ -277,15 +245,9 @@ async def test_aget_check_flips_200(
 
 @pytest.mark.asyncio
 @pytest.mark.respx
-async def test_get_check_flips_params_200(
+async def test_get_check_flips_params_200(fake_check_flips_api_result, respx_mock, test_async_client):
-    fake_check_flips_api_result, respx_mock, test_async_client
+    checks_url = urljoin(test_async_client._api_url, "checks/test/flips/?seconds=1&start=1&end=1")
-):
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json=fake_check_flips_api_result))
-    checks_url = urljoin(
-        test_async_client._api_url, "checks/test/flips/?seconds=1&start=1&end=1"
-    )
-    respx_mock.get(checks_url).mock(
-        return_value=Response(status_code=200, json=fake_check_flips_api_result)
-    )
     flips = await test_async_client.get_check_flips("test", seconds=1, start=1, end=1)
     assert len(flips) == len(fake_check_flips_api_result)
     assert flips[0].up == fake_check_flips_api_result[0]["up"]
@@ -293,9 +255,7 @@ async def test_get_check_flips_params_200(
 
 @pytest.mark.asyncio
 @pytest.mark.respx
-async def test_aget_check_flips_400(
+async def test_aget_check_flips_400(fake_check_flips_api_result, respx_mock, test_async_client):
-    fake_check_flips_api_result, respx_mock, test_async_client
-):
     flips_url = urljoin(test_async_client._api_url, "checks/test/flips/")
     respx_mock.get(flips_url).mock(return_value=Response(status_code=400))
     with pytest.raises(BadAPIRequestError):
@@ -304,13 +264,9 @@ async def test_aget_check_flips_400(
 
 @pytest.mark.asyncio
 @pytest.mark.respx
-async def test_aget_integrations(
+async def test_aget_integrations(fake_integrations_api_result, respx_mock, test_async_client):
-    fake_integrations_api_result, respx_mock, test_async_client
-):
     channels_url = urljoin(test_async_client._api_url, "channels/")
-    respx_mock.get(channels_url).mock(
+    respx_mock.get(channels_url).mock(return_value=Response(status_code=200, json=fake_integrations_api_result))
-        return_value=Response(status_code=200, json=fake_integrations_api_result)
-    )
     integrations = await test_async_client.get_integrations()
     assert len(integrations) == len(fake_integrations_api_result["channels"])
     assert integrations[0].id == fake_integrations_api_result["channels"][0]["id"]
@@ -320,9 +276,7 @@ async def test_aget_integrations(
 @pytest.mark.respx
 async def test_aget_badges(fake_badges_api_result, respx_mock, test_async_client):
     channels_url = urljoin(test_async_client._api_url, "badges/")
-    respx_mock.get(channels_url).mock(
+    respx_mock.get(channels_url).mock(return_value=Response(status_code=200, json=fake_badges_api_result))
-        return_value=Response(status_code=200, json=fake_badges_api_result)
-    )
     integrations = await test_async_client.get_badges()
     assert integrations.keys() == fake_badges_api_result["badges"].keys()
 
@@ -389,14 +343,10 @@ ping_test_parameters = [
 
 @pytest.mark.asyncio
 @pytest.mark.respx
-@pytest.mark.parametrize(
+@pytest.mark.parametrize("respx_mocker, tc, url, ping_method, method_kwargs", ping_test_parameters)
-    "respx_mocker, tc, url, ping_method, method_kwargs", ping_test_parameters
-)
 async def test_asuccess_ping(respx_mocker, tc, url, ping_method, method_kwargs):
     channels_url = urljoin(tc._ping_url, url)
-    respx_mocker.post(channels_url).mock(
+    respx_mocker.post(channels_url).mock(return_value=Response(status_code=200, text="OK"))
-        return_value=Response(status_code=200, text="OK")
-    )
     ping_method = getattr(tc, ping_method)
     result = await ping_method(**method_kwargs)
     assert result[0] is True

tests/client/test_check_trap.py

@@ -76,7 +76,6 @@ async def test_check_trap_async_exception(respx_mock, test_async_client):
 
 @pytest.mark.asyncio
 async def test_check_trap_wrong_client_error(test_client, test_async_client):
-
     with pytest.raises(WrongClientError):
         async with CheckTrap(test_client, uuid="test"):
             pass

tests/client/test_sync.py

@@ -14,9 +14,7 @@ from healthchecks_io.client.exceptions import HCAPIError
 
 
 @pytest.mark.respx
-def test_create_check_200_context_manager(
+def test_create_check_200_context_manager(fake_check_api_result, respx_mock, test_client):
-    fake_check_api_result, respx_mock, test_client
-):
     checks_url = urljoin(test_client._api_url, "checks/")
     respx_mock.post(checks_url).mock(
         return_value=Response(
@@ -110,9 +108,7 @@ def test_update_check_200(fake_check_api_result, respx_mock, test_client):
 def test_get_checks_200(fake_check_api_result, respx_mock, test_client):
     assert test_client._client is not None
     checks_url = urljoin(test_client._api_url, "checks/")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json={"checks": [fake_check_api_result]}))
-        return_value=Response(status_code=200, json={"checks": [fake_check_api_result]})
-    )
     checks = test_client.get_checks()
     assert len(checks) == 1
     assert checks[0].name == fake_check_api_result["name"]
@@ -121,13 +117,9 @@ def test_get_checks_200(fake_check_api_result, respx_mock, test_client):
 @pytest.mark.respx
 def test_get_checks_pass_in_client(fake_check_api_result, respx_mock):
     httpx_client = HTTPXClient()
-    test_client = Client(
+    test_client = Client(api_key="test", api_url="http://localhost/api/", client=httpx_client)
-        api_key="test", api_url="http://localhost/api/", client=httpx_client
-    )
     checks_url = urljoin(test_client._api_url, "checks/")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json={"checks": [fake_check_api_result]}))
-        return_value=Response(status_code=200, json={"checks": [fake_check_api_result]})
-    )
     checks = test_client.get_checks()
     assert len(checks) == 1
     assert checks[0].name == fake_check_api_result["name"]
@@ -169,9 +161,7 @@ def test_finalizer_closes(test_client):
 def test_get_check_200(fake_check_api_result, respx_mock, test_client):
     assert test_client._client is not None
     checks_url = urljoin(test_client._api_url, "checks/test")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json=fake_check_api_result))
-        return_value=Response(status_code=200, json=fake_check_api_result)
-    )
     check = test_client.get_check(check_id="test")
     assert check.name == fake_check_api_result["name"]
 
@@ -188,9 +178,7 @@ def test_check_get_404(respx_mock, test_client):
 @pytest.mark.respx
 def test_pause_check_200(fake_check_api_result, respx_mock, test_client):
     checks_url = urljoin(test_client._api_url, "checks/test/pause")
-    respx_mock.post(checks_url).mock(
+    respx_mock.post(checks_url).mock(return_value=Response(status_code=200, json=fake_check_api_result))
-        return_value=Response(status_code=200, json=fake_check_api_result)
-    )
     check = test_client.pause_check(check_id="test")
     assert check.name == fake_check_api_result["name"]
 
@@ -208,9 +196,7 @@ def test_check_pause_404(respx_mock, test_client):
 def test_delete_check_200(fake_check_api_result, respx_mock, test_client):
     assert test_client._client is not None
     checks_url = urljoin(test_client._api_url, "checks/test")
-    respx_mock.delete(checks_url).mock(
+    respx_mock.delete(checks_url).mock(return_value=Response(status_code=200, json=fake_check_api_result))
-        return_value=Response(status_code=200, json=fake_check_api_result)
-    )
     check = test_client.delete_check(check_id="test")
     assert check.name == fake_check_api_result["name"]
 
@@ -226,11 +212,7 @@ def test_delete_pause404(respx_mock, test_client):
 @pytest.mark.respx
 def test_get_check_pings_200(fake_check_pings_api_result, respx_mock, test_client):
     checks_url = urljoin(test_client._api_url, "checks/test/pings/")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json={"pings": fake_check_pings_api_result}))
-        return_value=Response(
-            status_code=200, json={"pings": fake_check_pings_api_result}
-        )
-    )
     pings = test_client.get_check_pings("test")
     assert len(pings) == len(fake_check_pings_api_result)
     assert pings[0].type == fake_check_pings_api_result[0]["type"]
@@ -239,24 +221,16 @@ def test_get_check_pings_200(fake_check_pings_api_result, respx_mock, test_clien
 @pytest.mark.respx
 def test_get_check_flips_200(fake_check_flips_api_result, respx_mock, test_client):
     checks_url = urljoin(test_client._api_url, "checks/test/flips/")
-    respx_mock.get(checks_url).mock(
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json=fake_check_flips_api_result))
-        return_value=Response(status_code=200, json=fake_check_flips_api_result)
-    )
     flips = test_client.get_check_flips("test")
     assert len(flips) == len(fake_check_flips_api_result)
     assert flips[0].up == fake_check_flips_api_result[0]["up"]
 
 
 @pytest.mark.respx
-def test_get_check_flips_params_200(
+def test_get_check_flips_params_200(fake_check_flips_api_result, respx_mock, test_client):
-    fake_check_flips_api_result, respx_mock, test_client
+    checks_url = urljoin(test_client._api_url, "checks/test/flips/?seconds=1&start=1&end=1")
-):
+    respx_mock.get(checks_url).mock(return_value=Response(status_code=200, json=fake_check_flips_api_result))
-    checks_url = urljoin(
-        test_client._api_url, "checks/test/flips/?seconds=1&start=1&end=1"
-    )
-    respx_mock.get(checks_url).mock(
-        return_value=Response(status_code=200, json=fake_check_flips_api_result)
-    )
     flips = test_client.get_check_flips("test", seconds=1, start=1, end=1)
     assert len(flips) == len(fake_check_flips_api_result)
     assert flips[0].up == fake_check_flips_api_result[0]["up"]
@@ -273,9 +247,7 @@ def test_get_check_flips_400(fake_check_flips_api_result, respx_mock, test_clien
 @pytest.mark.respx
 def test_get_integrations(fake_integrations_api_result, respx_mock, test_client):
     channels_url = urljoin(test_client._api_url, "channels/")
-    respx_mock.get(channels_url).mock(
+    respx_mock.get(channels_url).mock(return_value=Response(status_code=200, json=fake_integrations_api_result))
-        return_value=Response(status_code=200, json=fake_integrations_api_result)
-    )
     integrations = test_client.get_integrations()
     assert len(integrations) == len(fake_integrations_api_result["channels"])
     assert integrations[0].id == fake_integrations_api_result["channels"][0]["id"]
@@ -284,9 +256,7 @@ def test_get_integrations(fake_integrations_api_result, respx_mock, test_client)
 @pytest.mark.respx
 def test_get_badges(fake_badges_api_result, respx_mock, test_client):
     channels_url = urljoin(test_client._api_url, "badges/")
-    respx_mock.get(channels_url).mock(
+    respx_mock.get(channels_url).mock(return_value=Response(status_code=200, json=fake_badges_api_result))
-        return_value=Response(status_code=200, json=fake_badges_api_result)
-    )
     integrations = test_client.get_badges()
     assert integrations.keys() == fake_badges_api_result["badges"].keys()
 
@@ -352,14 +322,10 @@ ping_test_parameters = [
 
 
 @pytest.mark.respx
-@pytest.mark.parametrize(
+@pytest.mark.parametrize("respx_mocker, tc, url, ping_method, method_kwargs", ping_test_parameters)
-    "respx_mocker, tc, url, ping_method, method_kwargs", ping_test_parameters
-)
 def test_success_ping(respx_mocker, tc, url, ping_method, method_kwargs):
     channels_url = urljoin(tc._ping_url, url)
-    respx_mocker.post(channels_url).mock(
+    respx_mocker.post(channels_url).mock(return_value=Response(status_code=200, text="OK"))
-        return_value=Response(status_code=200, text="OK")
-    )
     ping_method = getattr(tc, ping_method)
     result, text = ping_method(**method_kwargs)
     assert result is True

tests/schemas/test_checks.py

@@ -37,27 +37,19 @@ def test_check_create_validators():
 
     # test validate_schedule
     with pytest.raises(ValidationError):
-        check_create = checks.CheckCreate(
+        check_create = checks.CheckCreate(name="Test", tags="", desc="Test", schedule="no good")
-            name="Test", tags="", desc="Test", schedule="no good"
-        )
 
     # test validate_tz
     with pytest.raises(ValidationError):
-        check_create = checks.CheckCreate(
+        check_create = checks.CheckCreate(name="Test", tags="", desc="Test", tz="no good")
-            name="Test", tags="", desc="Test", tz="no good"
-        )
 
     # test validate_methods
     with pytest.raises(ValidationError):
-        check_create = checks.CheckCreate(
+        check_create = checks.CheckCreate(name="Test", tags="", desc="Test", methods="no good")
-            name="Test", tags="", desc="Test", methods="no good"
-        )
 
     # test validate_unique
     with pytest.raises(ValidationError):
-        check_create = checks.CheckCreate(
+        check_create = checks.CheckCreate(name="Test", tags="", desc="Test", unique=["no good"])
-            name="Test", tags="", desc="Test", unique=["no good"]
-        )
 
 
 def test_check_pings_from_api():