Merge branch 'master' into py312

Author: cwacek

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: '/'
+    schedule:
+      interval: weekly 

.github/stale.yml

@@ -14,7 +14,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -28,23 +28,24 @@ jobs:
       run: |
         black --check --diff --extend-exclude=versioneer.py .
 
-  build:
+  test:
 
     needs: lint
-    name: "Build ${{matrix.python-version}} (continue-on-error: ${{matrix.experimental}})"
-    runs-on: ubuntu-latest
+    name: Test (${{ matrix.os }}, ${{ matrix.python-version }}, ${{ matrix.experimental }})
+    runs-on: ${{ matrix.os }}-latest
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: true
       matrix:
+        os: [ubuntu, macos, windows]
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         include:
           - experimental: false
           - python-version: "3.12"
             experimental: true
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

.github/workflows/pythonpackage.yml

@@ -1,6 +1,6 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev:  23.7.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.7.0
     hooks:
     - id: black
-      language_version: python3.9
+      language_version: python3.11

.github/workflows/stale.yml

@@ -1,20 +1,19 @@
+import importlib.resources
+import json
+
 import pytest
 
-import json
-import pkg_resources
-import os
 import python_jsonschema_objects as pjs
-import python_jsonschema_objects.markdown_support
 
 
 @pytest.fixture
 def markdown_examples():
-    md = pkg_resources.resource_filename(
+    with importlib.resources.path(
         "python_jsonschema_objects.examples", "README.md"
-    )
-    examples = python_jsonschema_objects.markdown_support.extract_code_blocks(md)
-    examples = {json.loads(v)["title"]: json.loads(v) for v in examples["schema"]}
-    return examples
+    ) as md:
+        examples = pjs.markdown_support.extract_code_blocks(md)
+
+    return {json.loads(v)["title"]: json.loads(v) for v in examples["schema"]}
 
 
 @pytest.fixture(autouse=True)

.pre-commit-config.yaml

@@ -17,9 +17,6 @@ def test_limited_validation(mocker):
     validate_items = mocker.patch.object(
         validator, "validate_items", side_effect=validator.validate_items
     )
-    validate = mocker.patch.object(
-        validator, "validate", side_effect=validator.validate
-    )
     mocker.patch.dict(
         ns1.ExampleSchema.a.info,
         {"validator": mocker.MagicMock(return_value=validator)},
@@ -59,9 +56,6 @@ def test_strict_validation(mocker):
     validate_items = mocker.patch.object(
         validator, "validate_items", side_effect=validator.validate_items
     )
-    validate = mocker.patch.object(
-        validator, "validate", side_effect=validator.validate
-    )
     mocker.patch.dict(
         ns1.ExampleSchema.a.info,
         {"validator": mocker.MagicMock(return_value=validator)},

conftest.py

@@ -13,7 +13,7 @@ python =
 
 [testenv]
 commands =
-  coverage run {envbindir}/pytest --doctest-glob='python_jsonschema_objects/*.md' {posargs}
+  coverage run -m pytest --doctest-glob='python_jsonschema_objects/*.md' {posargs}
   coverage xml --omit='*test*'
 deps =
   coverage