more CI fixes

src/hypothesis_jsonschema/_from_schema.py

@@ -635,7 +635,7 @@ def object_schema(
 
     valid_name = make_validator(names).is_valid
     known: set = set(filter(valid_name, set(dep_names).union(dep_schemas, properties)))
-    for name in known:
+    for name in sorted(known.union(required)):
         alphabet.check_name_allowed(name)
     known_optional_names: List[str] = sorted(known - set(required))
     name_strats = (

tests/test_canonicalise.py

@@ -550,6 +550,9 @@ def _merge_semantics_helper(data, s1, s2, combined):
     assert is_valid(i2, s1) == is_valid(i2, combined)
 
 
+@pytest.mark.xfail(
+    strict=False, reason="https://github.com/python-jsonschema/jsonschema/issues/1159"
+)
 @settings(suppress_health_check=list(HealthCheck), deadline=None)
 @given(st.data(), json_schemata(), json_schemata())
 def test_merge_semantics(data, s1, s2):