From e2d7866e3e4474cf2fdc9703b133a97f324406fc Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Sun, 19 Nov 2023 17:15:16 -0800 Subject: [PATCH] Fixes a failure regarding uni status on :edge --- .gitignore | 141 ++-------------------------------------- .pre-commit-config.yaml | 2 +- pyproject.toml | 5 +- tests/test_health.py | 5 +- 4 files changed, 10 insertions(+), 143 deletions(-) diff --git a/.gitignore b/.gitignore index 97a31f3..79740f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,163 +1,30 @@ # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] -*$py.class -# C extensions -*.so +# Ruff cache +.ruff_cache/ # Distribution / packaging -.Python -build/ -develop-eggs/ dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ -.tox/ -.nox/ .coverage .coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ .pytest_cache/ -cover/ +coverage.xml coverage.json -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/#use-with-ide -.pdm.toml - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py # Environments .env .venv env/ venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site # mypy .mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ +# Possible PDF generated from testing tests/outputs/** diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6a4c9c1..60646ef 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,7 +37,7 @@ repos: exclude: "(^Pipfile\\.lock$)" # Python hooks - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.1.5' + rev: 'v0.1.6' hooks: - id: ruff - repo: https://github.com/psf/black diff --git a/pyproject.toml b/pyproject.toml index db81536..1c88a51 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,10 +84,9 @@ cov = [ "cov-html" ] -[[tool.hatch.envs.all.matrix]] -python = ["3.8", "3.9", "3.10", "3.11", "3.12"] - [tool.hatch.envs.pre-commit] +template = "pre-commit" +detached = true dependencies = [ "pre-commit>=3.5.0", ] diff --git a/tests/test_health.py b/tests/test_health.py index 84f415e..ff58223 100644 --- a/tests/test_health.py +++ b/tests/test_health.py @@ -11,5 +11,6 @@ def test_health_endpoint( assert status.overall == StatusOptions.Up assert status.chromium is not None assert status.chromium.status == StatusOptions.Up - assert status.uno is not None - assert status.uno.status == StatusOptions.Up + if "uno" in status.data: + assert status.uno is not None + assert status.uno.status == StatusOptions.Up