From 52e9f7c36d44dced715581a446d336b506942c13 Mon Sep 17 00:00:00 2001 From: Cordell Blakkan Date: Tue, 5 Mar 2024 11:58:40 -0500 Subject: [PATCH] Update tox --- .github/workflows/run-tests.yml | 2 +- .gitignore | 2 +- README.md | 6 +++--- requirements.txt | 2 +- tox.ini | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7fc4844..84db92a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.10] + python-version: ["3.8", "3.10"] steps: - uses: actions/checkout@v2 diff --git a/.gitignore b/.gitignore index 64feae4..3954662 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ pip-delete-this-directory.txt # Unit test / coverage reports .tox/ xunit/ -.coverage +.coverage* .cache nosetests.xml coverage.xml diff --git a/README.md b/README.md index b16e89a..4f1eb15 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Yamale (ya·ma·lē) | :warning: Ensure that your schema definitions come from internal or trusted sources. Yamale does not protect against intentionally malicious schemas. | |:------------| -Yamale +Yamale A schema and validator for YAML. @@ -35,7 +35,7 @@ building Python 3 from source; in all three cases, Apple's Command Line Tools (C may be required. See also [developers](#developers), below. ### Manual -1. Download Yamale from: https://github.com/23andMe/Yamale/archive/master.zip +1. Download Yamale from: https://github.com/23andMe/Yamale/archive/main.zip 2. Unzip somewhere temporary 3. Run `python setup.py install` (may have to prepend `sudo`) @@ -420,7 +420,7 @@ validator. - keywords: - `allow_empty`: Allow the subset to be empty (and is, therefore, also optional). This overrides the `required` flag. - + Examples: - `subset(int(), str())`: Validators against an integer, a string, or a list of either. - `subset(int(), str(), allow_empty=True)`: Same as above, but allows the empty set and makes the subset optional. diff --git a/requirements.txt b/requirements.txt index 534bbce..ed71f87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -tox==3.15.2 +tox==4.13.0 diff --git a/tox.ini b/tox.ini index f7917e3..440e2ab 100644 --- a/tox.ini +++ b/tox.ini @@ -10,5 +10,5 @@ python = commands = py.test --cov yamale --cov-report term-missing yamale deps = ruamel.yaml<1 - pytest<6 - pytest-cov<3 + pytest<7 + pytest-cov<4