Merge pull request #669 from opensafely-core/revert-635-pydantic-v2

Revert "Bump pipeline to v2023.08.21.134839 (pydantic v2)"

jobrunner/actions.py

@@ -79,7 +79,7 @@ def get_action_specification(config, action_id, using_dummy_data_backend=False):
     return ActionSpecification(
         run=run_command,
         needs=action_spec.needs,
-        outputs=action_spec.outputs.model_dump(exclude_unset=True),
+        outputs=action_spec.outputs.dict(exclude_unset=True),
     )
 
 

pyproject.toml

@@ -14,7 +14,7 @@ classifiers = [
 ]
 requires-python = ">=3.8"
 dependencies = [
-  "opensafely-pipeline @ git+https://github.com/opensafely-core/[email protected].21.134839",
+  "opensafely-pipeline @ git+https://github.com/opensafely-core/[email protected].09.102223",
   "ruyaml",
   "requests",
   "opentelemetry-exporter-otlp-proto-http",

requirements.prod.txt

@@ -4,8 +4,6 @@
 #
 #    pip-compile --allow-unsafe --output-file=requirements.prod.txt pyproject.toml
 #
-annotated-types==0.5.0
-    # via pydantic
 backoff==2.1.2
     # via opentelemetry-exporter-otlp-proto-http
 certifi==2020.11.8
@@ -20,7 +18,7 @@ googleapis-common-protos==1.56.4
     # via opentelemetry-exporter-otlp-proto-http
 idna==2.10
     # via requests
-opensafely-pipeline @ git+https://github.com/opensafely-core/[email protected].21.134839
+opensafely-pipeline @ git+https://github.com/opensafely-core/[email protected].09.102223
     # via opensafely-jobrunner (pyproject.toml)
 opentelemetry-api==1.12.0
     # via
@@ -38,10 +36,8 @@ protobuf==3.20.2
     # via
     #   googleapis-common-protos
     #   opentelemetry-proto
-pydantic==2.2.1
+pydantic==1.10.12
     # via opensafely-pipeline
-pydantic-core==2.6.1
-    # via pydantic
 requests==2.25.0
     # via
     #   opensafely-jobrunner (pyproject.toml)
@@ -52,10 +48,8 @@ ruyaml==0.91.0
     #   opensafely-pipeline
 typing-extensions==4.7.1
     # via
-    #   annotated-types
     #   opentelemetry-sdk
     #   pydantic
-    #   pydantic-core
 urllib3==1.26.5
     # via requests
 wrapt==1.14.1

tests/lib/test_lru_dict.py

@@ -8,7 +8,7 @@
 from jobrunner.lib.lru_dict import LRUDict
 
 
-@settings(max_examples=500, deadline=500)
+@settings(max_examples=500)
 class LRUDictValidation(RuleBasedStateMachine):
     capacity = 5
     keys = st.integers(min_value=1)