diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 707557bf..c4e763f8 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -60,11 +60,11 @@ jobs: - # test with the latest dependencies os: ubuntu-latest python-version: '3.11' - toxenv-factors: 'current' + toxenv-factors: '-current' - # test with the lowest dependencies os: ubuntu-latest python-version: '3.7' - toxenv-factors: 'lowest' + toxenv-factors: '-lowest' steps: - name: Checkout # see https://github.com/actions/checkout diff --git a/tests/test_validation_json.py b/tests/test_validation_json.py index 583a597b..00c91851 100644 --- a/tests/test_validation_json.py +++ b/tests/test_validation_json.py @@ -38,7 +38,7 @@ def _dp(prefix: str) -> Generator: return ( (sv, tf) for sv in SchemaVersion if sv not in UNSUPPORTED_SCHEMA_VERSIONS - for tf in iglob(f'{prefix}-*.json', root_dir=join(RELEVANT_TESTDATA_DIRECTORY, sv.to_version())) + for tf in iglob(join(RELEVANT_TESTDATA_DIRECTORY, sv.to_version(), f'{prefix}-*.json')) ) @@ -54,7 +54,7 @@ def test_throws_with_unsupported_schema_version(self, schema_version: SchemaVers @unpack def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: str) -> None: validator = JsonValidator(schema_version) - with open(join(RELEVANT_TESTDATA_DIRECTORY, schema_version.to_version(), test_data_file), 'r') as tdfh: + with open(join(test_data_file), 'r') as tdfh: test_data = tdfh.read() try: validation_error = validator.validate_str(test_data) @@ -66,7 +66,7 @@ def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: s @unpack def test_validate_expected_error(self, schema_version: SchemaVersion, test_data_file: str) -> None: validator = JsonValidator(schema_version) - with open(join(RELEVANT_TESTDATA_DIRECTORY, schema_version.to_version(), test_data_file), 'r') as tdfh: + with open(join(test_data_file), 'r') as tdfh: test_data = tdfh.read() try: validation_error = validator.validate_str(test_data) @@ -88,7 +88,7 @@ def test_throws_with_unsupported_schema_version(self, schema_version: SchemaVers @unpack def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: str) -> None: validator = JsonStrictValidator(schema_version) - with open(join(RELEVANT_TESTDATA_DIRECTORY, schema_version.to_version(), test_data_file), 'r') as tdfh: + with open(join(test_data_file), 'r') as tdfh: test_data = tdfh.read() try: validation_error = validator.validate_str(test_data) @@ -100,7 +100,7 @@ def test_validate_no_none(self, schema_version: SchemaVersion, test_data_file: s @unpack def test_validate_expected_error(self, schema_version: SchemaVersion, test_data_file: str) -> None: validator = JsonStrictValidator(schema_version) - with open(join(RELEVANT_TESTDATA_DIRECTORY, schema_version.to_version(), test_data_file), 'r') as tdfh: + with open(join(test_data_file), 'r') as tdfh: test_data = tdfh.read() try: validation_error = validator.validate_str(test_data)