diff --git a/.github/workflows/test_and_publish.yml b/.github/workflows/test_and_publish.yml index 79e1a24..8d7a6dc 100644 --- a/.github/workflows/test_and_publish.yml +++ b/.github/workflows/test_and_publish.yml @@ -43,7 +43,7 @@ jobs: - linux: py311-test-mpl37 # Test different versions of pytest - linux: py312-test-mpldev-pytestdev - - linux: py39-test-mpl32-pytest62 + - linux: py39-test-mpl33-pytest62 - linux: py38-test-mpl31-pytest54 coverage: 'codecov' diff --git a/tests/baseline/hashes/mpl20_ft261.json b/tests/baseline/hashes/mpl20_ft261.json index 7fe1a4e..47c4eac 100644 --- a/tests/baseline/hashes/mpl20_ft261.json +++ b/tests/baseline/hashes/mpl20_ft261.json @@ -1,14 +1,4 @@ { - "test_pytest_mpl.test_succeeds": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_remote": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_faulty_mirror": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_dpi": "cc21ba84cc41dfcf77f46f5543affed721df2384958fa0adc4e5e60470852781", - "test_pytest_mpl.test_tolerance": "ab176e655d3dca536ce74f7447d4eb8b7f70649a81a4055e5ce77c1f53c3a46f", - "test_pytest_mpl.test_base_style": "92497fd88fc46bf7a99b1afd32e7fb73fa06fa1ceaee7bcc443324e45c6b4d91", - "test_pytest_mpl.test_remove_text": "9c284d7bcbbb1d6c1362b417859e4ce842b573a2fe32c7ceaafcf328a1eb7057", - "test_pytest_mpl.test_parametrized[5]": "04c998af2d7932ca4a851d610e8a020d94a2f623d1301dbe9b59fe6efd28a5f7", - "test_pytest_mpl.test_parametrized[50]": "937d986ab6b209e7d48eb30cc30e9db62c93bbc4c86768e276a5b454e63bca93", - "test_pytest_mpl.test_parametrized[500]": "e39ed724b0762b8736879801e32dc0c1525afd03c0567a43b119435aaa608498", "test_pytest_mpl.test_hash_succeeds": "480062c2239ed9d70e361d1a5b578dc2aa756971161ac6e7287b492ae6118c59", "test.test_modified": "54f6cf83d5b06fa2ecb7fa23d6e87898679178ef5d0dfdd2551a139f1932127b", "test.test_new": "54f6cf83d5b06fa2ecb7fa23d6e87898679178ef5d0dfdd2551a139f1932127b", diff --git a/tests/baseline/hashes/mpl21_ft261.json b/tests/baseline/hashes/mpl21_ft261.json index caa4f64..73286d5 100644 --- a/tests/baseline/hashes/mpl21_ft261.json +++ b/tests/baseline/hashes/mpl21_ft261.json @@ -1,14 +1,4 @@ { - "test_pytest_mpl.test_succeeds": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_remote": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_faulty_mirror": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_dpi": "cc21ba84cc41dfcf77f46f5543affed721df2384958fa0adc4e5e60470852781", - "test_pytest_mpl.test_tolerance": "ab176e655d3dca536ce74f7447d4eb8b7f70649a81a4055e5ce77c1f53c3a46f", - "test_pytest_mpl.test_base_style": "92497fd88fc46bf7a99b1afd32e7fb73fa06fa1ceaee7bcc443324e45c6b4d91", - "test_pytest_mpl.test_remove_text": "9c284d7bcbbb1d6c1362b417859e4ce842b573a2fe32c7ceaafcf328a1eb7057", - "test_pytest_mpl.test_parametrized[5]": "04c998af2d7932ca4a851d610e8a020d94a2f623d1301dbe9b59fe6efd28a5f7", - "test_pytest_mpl.test_parametrized[50]": "937d986ab6b209e7d48eb30cc30e9db62c93bbc4c86768e276a5b454e63bca93", - "test_pytest_mpl.test_parametrized[500]": "e39ed724b0762b8736879801e32dc0c1525afd03c0567a43b119435aaa608498", "test_pytest_mpl.test_hash_succeeds": "17b65dd0247b0dfd8c1b4b079352414ae0fe03c0a3e79d63c8b8670d84d4098f", "test.test_modified": "14d326881467bc613e6504b87bd7d556a5e58668ff16b896fa3c15745cfb6336", "test.test_new": "14d326881467bc613e6504b87bd7d556a5e58668ff16b896fa3c15745cfb6336", diff --git a/tests/baseline/hashes/mpl22_ft261.json b/tests/baseline/hashes/mpl22_ft261.json index 92b28d0..fbde756 100644 --- a/tests/baseline/hashes/mpl22_ft261.json +++ b/tests/baseline/hashes/mpl22_ft261.json @@ -1,14 +1,4 @@ { - "test_pytest_mpl.test_succeeds": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_remote": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_faulty_mirror": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_dpi": "cc21ba84cc41dfcf77f46f5543affed721df2384958fa0adc4e5e60470852781", - "test_pytest_mpl.test_tolerance": "ab176e655d3dca536ce74f7447d4eb8b7f70649a81a4055e5ce77c1f53c3a46f", - "test_pytest_mpl.test_base_style": "92497fd88fc46bf7a99b1afd32e7fb73fa06fa1ceaee7bcc443324e45c6b4d91", - "test_pytest_mpl.test_remove_text": "9c284d7bcbbb1d6c1362b417859e4ce842b573a2fe32c7ceaafcf328a1eb7057", - "test_pytest_mpl.test_parametrized[5]": "04c998af2d7932ca4a851d610e8a020d94a2f623d1301dbe9b59fe6efd28a5f7", - "test_pytest_mpl.test_parametrized[50]": "937d986ab6b209e7d48eb30cc30e9db62c93bbc4c86768e276a5b454e63bca93", - "test_pytest_mpl.test_parametrized[500]": "e39ed724b0762b8736879801e32dc0c1525afd03c0567a43b119435aaa608498", "test_pytest_mpl.test_hash_succeeds": "e80557c8784fb920fb79b03b26dc072649a98811f00a8c212df8761e4351acde", "test.test_modified": "80e0ee6df7cf7d9d9407395a25af30beb8763e98820a7be972764899246d2cd7", "test.test_new": "80e0ee6df7cf7d9d9407395a25af30beb8763e98820a7be972764899246d2cd7", diff --git a/tests/baseline/hashes/mpl30_ft261.json b/tests/baseline/hashes/mpl30_ft261.json index 198ed75..b928fbb 100644 --- a/tests/baseline/hashes/mpl30_ft261.json +++ b/tests/baseline/hashes/mpl30_ft261.json @@ -1,19 +1,9 @@ { - "test_pytest_mpl.test_succeeds": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_remote": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_faulty_mirror": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_dpi": "cc21ba84cc41dfcf77f46f5543affed721df2384958fa0adc4e5e60470852781", - "test_pytest_mpl.test_tolerance": "ab176e655d3dca536ce74f7447d4eb8b7f70649a81a4055e5ce77c1f53c3a46f", - "test_pytest_mpl.test_base_style": "92497fd88fc46bf7a99b1afd32e7fb73fa06fa1ceaee7bcc443324e45c6b4d91", - "test_pytest_mpl.test_remove_text": "9c284d7bcbbb1d6c1362b417859e4ce842b573a2fe32c7ceaafcf328a1eb7057", - "test_pytest_mpl.test_parametrized[5]": "04c998af2d7932ca4a851d610e8a020d94a2f623d1301dbe9b59fe6efd28a5f7", - "test_pytest_mpl.test_parametrized[50]": "937d986ab6b209e7d48eb30cc30e9db62c93bbc4c86768e276a5b454e63bca93", - "test_pytest_mpl.test_parametrized[500]": "e39ed724b0762b8736879801e32dc0c1525afd03c0567a43b119435aaa608498", - "test_pytest_mpl.test_hash_succeeds": "4e1157a93733cdb327f1741afdb0525f4d0e3f12e60b54f72c93db9f9c9ae27f", - "test.test_modified": "6e2e4ba7b77caf62df24f6b92d6fc51ab1b837bf98039750334f65c0a6c5d898", - "test.test_new": "6e2e4ba7b77caf62df24f6b92d6fc51ab1b837bf98039750334f65c0a6c5d898", - "test.test_unmodified": "6e2e4ba7b77caf62df24f6b92d6fc51ab1b837bf98039750334f65c0a6c5d898", - "test_formats.test_format_eps": "f8a0fbb33dcd473ef5cfdd69317db6eb58d64a7f5f3b5072e0de69aa9e201224", - "test_formats.test_format_pdf": "8963ba9209080091c0961553bdf195cdcd0f2ba29081a122f9aad8e94c444aff", - "test_formats.test_format_png": "d577a3c8c7550413d8d50bc26a68f3e8d9c35d4763c52cbcc15df4f61c8406b2" + "test_pytest_mpl.test_hash_succeeds": "ffbe386e7bbd8c720a44d2775dfe207b6dcca9304d845b557071a72b8c31ce04", + "test.test_modified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_new": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_unmodified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test_formats.test_format_eps": "4a605a2cd24101b9292151f5ab6d6846ba1b9c856cfda2bee6a142380e257b04", + "test_formats.test_format_pdf": "34a9eb10372b35c0bd26472e8571a91031c055ab47cc3682ebc0c5e47c2b6cbd", + "test_formats.test_format_png": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904" } diff --git a/tests/baseline/hashes/mpl31_ft261.json b/tests/baseline/hashes/mpl31_ft261.json index 18a1fab..421a2ab 100644 --- a/tests/baseline/hashes/mpl31_ft261.json +++ b/tests/baseline/hashes/mpl31_ft261.json @@ -1,18 +1,8 @@ { - "test_pytest_mpl.test_succeeds": "2a4da3a36b384df539f3f47d476f67a918f5eee1df360dbab9469b96260df78f", - "test_pytest_mpl.test_succeeds_remote": "2a4da3a36b384df539f3f47d476f67a918f5eee1df360dbab9469b96260df78f", - "test_pytest_mpl.test_succeeds_faulty_mirror": "2a4da3a36b384df539f3f47d476f67a918f5eee1df360dbab9469b96260df78f", - "test_pytest_mpl.test_dpi": "2fd74751a8654eb0b32ff0663fd8ec137fba20aec0eb6871e312e9a8ff1fe296", - "test_pytest_mpl.test_tolerance": "3675e5a48388e8cc341580e9b41115d3cf63d2465cf11eeed3faa23e84030fc2", - "test_pytest_mpl.test_base_style": "781074a09615b6efb9aae8ea7630c4c59dce4f7c02b7fc4ce594ccf681955586", - "test_pytest_mpl.test_remove_text": "41c85cd546792245d6b2b2ebf5742d3053e679a5e088407738f4785517d8dbac", - "test_pytest_mpl.test_parametrized[5]": "be7dc9de64a5d6fd458c1f930d4aa56cf8196ddb0e8b5b07ab79a1f0ea9eb820", - "test_pytest_mpl.test_parametrized[50]": "a8ae2427337803dc864784d88c4428a6af5a3e47d2bfc84c98b68b25fde75704", - "test_pytest_mpl.test_parametrized[500]": "590ef42388378173e293bd37e95ff22d8e753d53327d1fb5d6bdf2bac4f84d01", - "test_pytest_mpl.test_hash_succeeds": "2a4da3a36b384df539f3f47d476f67a918f5eee1df360dbab9469b96260df78f", - "test.test_modified": "3675e5a48388e8cc341580e9b41115d3cf63d2465cf11eeed3faa23e84030fc2", - "test.test_new": "3675e5a48388e8cc341580e9b41115d3cf63d2465cf11eeed3faa23e84030fc2", - "test.test_unmodified": "3675e5a48388e8cc341580e9b41115d3cf63d2465cf11eeed3faa23e84030fc2", + "test_pytest_mpl.test_hash_succeeds": "d577a3c8c7550413d8d50bc26a68f3e8d9c35d4763c52cbcc15df4f61c8406b2", + "test.test_modified": "b7a4b4a01e8cf66c805ab456bf3f807066acf86a11af669b557b2aa98586f2c0", + "test.test_new": "b7a4b4a01e8cf66c805ab456bf3f807066acf86a11af669b557b2aa98586f2c0", + "test.test_unmodified": "b7a4b4a01e8cf66c805ab456bf3f807066acf86a11af669b557b2aa98586f2c0", "test_formats.test_format_eps": "108a341ce450cb5adef9f41e27175da1809fcdeb64f17b13f58d3eb0efc08006", "test_formats.test_format_pdf": "8963ba9209080091c0961553bdf195cdcd0f2ba29081a122f9aad8e94c444aff", "test_formats.test_format_png": "d577a3c8c7550413d8d50bc26a68f3e8d9c35d4763c52cbcc15df4f61c8406b2" diff --git a/tests/baseline/hashes/mpl32_ft261.json b/tests/baseline/hashes/mpl32_ft261.json index 3cb208e..b928fbb 100644 --- a/tests/baseline/hashes/mpl32_ft261.json +++ b/tests/baseline/hashes/mpl32_ft261.json @@ -1,19 +1,9 @@ { - "test_pytest_mpl.test_succeeds": "8b8ff9ce044bc9075876278781667a708414460209bba25a39d8262ed73d0f04", - "test_pytest_mpl.test_succeeds_remote": "8b8ff9ce044bc9075876278781667a708414460209bba25a39d8262ed73d0f04", - "test_pytest_mpl.test_succeeds_faulty_mirror": "8b8ff9ce044bc9075876278781667a708414460209bba25a39d8262ed73d0f04", - "test_pytest_mpl.test_dpi": "812d841fdc4b84bb7d80e08e484932fd2775dd83e347c50516ed5941c8ad933c", - "test_pytest_mpl.test_tolerance": "3b7db65812fd59403d17a2fba3ebe1fd0abdfde8633df06636e4e1daea259da0", - "test_pytest_mpl.test_base_style": "23c0c0cd74c3daa99a60d9d0500fb2ec4a6f87ddcaa46309ebd608b03b04a0a9", - "test_pytest_mpl.test_remove_text": "cbc0daabceb9b46eaff0031a045bf659ce694b0962443ef26d19aa54425aaa39", - "test_pytest_mpl.test_parametrized[5]": "9b2b5b1df784c8f9a5fc624840138fe7b4dbdd42cf592fe5733c9c825e5dda91", - "test_pytest_mpl.test_parametrized[50]": "fcf0566ef5514674e2b4bf1e9b4c7f52451c6f98abdc75dc876f43c97a23bc32", - "test_pytest_mpl.test_parametrized[500]": "38dccccfc980b44359bc1b325bef48471bc084db37ed622af00a553792a8b093", - "test_pytest_mpl.test_hash_succeeds": "8b8ff9ce044bc9075876278781667a708414460209bba25a39d8262ed73d0f04", - "test.test_modified": "3b7db65812fd59403d17a2fba3ebe1fd0abdfde8633df06636e4e1daea259da0", - "test.test_new": "3b7db65812fd59403d17a2fba3ebe1fd0abdfde8633df06636e4e1daea259da0", - "test.test_unmodified": "3b7db65812fd59403d17a2fba3ebe1fd0abdfde8633df06636e4e1daea259da0", - "test_formats.test_format_eps": "76d0a064029518d1e72c1ff5f159c5e9c3ca77ecb2c7fbab82229aacf61aa4fc", - "test_formats.test_format_pdf": "8963ba9209080091c0961553bdf195cdcd0f2ba29081a122f9aad8e94c444aff", - "test_formats.test_format_png": "d577a3c8c7550413d8d50bc26a68f3e8d9c35d4763c52cbcc15df4f61c8406b2" + "test_pytest_mpl.test_hash_succeeds": "ffbe386e7bbd8c720a44d2775dfe207b6dcca9304d845b557071a72b8c31ce04", + "test.test_modified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_new": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_unmodified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test_formats.test_format_eps": "4a605a2cd24101b9292151f5ab6d6846ba1b9c856cfda2bee6a142380e257b04", + "test_formats.test_format_pdf": "34a9eb10372b35c0bd26472e8571a91031c055ab47cc3682ebc0c5e47c2b6cbd", + "test_formats.test_format_png": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904" } diff --git a/tests/baseline/hashes/mpl33_ft261.json b/tests/baseline/hashes/mpl33_ft261.json index b8568f2..3fdf024 100644 --- a/tests/baseline/hashes/mpl33_ft261.json +++ b/tests/baseline/hashes/mpl33_ft261.json @@ -1,18 +1,8 @@ { - "test_pytest_mpl.test_succeeds": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_remote": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_succeeds_faulty_mirror": "cd01b7a39330033b18d54b507635236214cae5e24f9e09d84b56462a9ac81052", - "test_pytest_mpl.test_dpi": "cc21ba84cc41dfcf77f46f5543affed721df2384958fa0adc4e5e60470852781", - "test_pytest_mpl.test_tolerance": "ab176e655d3dca536ce74f7447d4eb8b7f70649a81a4055e5ce77c1f53c3a46f", - "test_pytest_mpl.test_base_style": "92497fd88fc46bf7a99b1afd32e7fb73fa06fa1ceaee7bcc443324e45c6b4d91", - "test_pytest_mpl.test_remove_text": "9c284d7bcbbb1d6c1362b417859e4ce842b573a2fe32c7ceaafcf328a1eb7057", - "test_pytest_mpl.test_parametrized[5]": "04c998af2d7932ca4a851d610e8a020d94a2f623d1301dbe9b59fe6efd28a5f7", - "test_pytest_mpl.test_parametrized[50]": "937d986ab6b209e7d48eb30cc30e9db62c93bbc4c86768e276a5b454e63bca93", - "test_pytest_mpl.test_parametrized[500]": "e39ed724b0762b8736879801e32dc0c1525afd03c0567a43b119435aaa608498", - "test_pytest_mpl.test_hash_succeeds": "55ad74a44c99606f1df1e79f67a59a4986bddc2b48ea2b2d7ea8365db91dc7ca", - "test.test_modified": "ce07de6b726c3b01afb03aa7c9e939d584bc71a54b9737d69853a0d915cd6181", - "test.test_new": "ce07de6b726c3b01afb03aa7c9e939d584bc71a54b9737d69853a0d915cd6181", - "test.test_unmodified": "ce07de6b726c3b01afb03aa7c9e939d584bc71a54b9737d69853a0d915cd6181", + "test_pytest_mpl.test_hash_succeeds": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test.test_modified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_new": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_unmodified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", "test_formats.test_format_eps": "4a605a2cd24101b9292151f5ab6d6846ba1b9c856cfda2bee6a142380e257b04", "test_formats.test_format_pdf": "34a9eb10372b35c0bd26472e8571a91031c055ab47cc3682ebc0c5e47c2b6cbd", "test_formats.test_format_png": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", diff --git a/tests/baseline/hashes/mpl34_ft261.json b/tests/baseline/hashes/mpl34_ft261.json new file mode 100644 index 0000000..3fdf024 --- /dev/null +++ b/tests/baseline/hashes/mpl34_ft261.json @@ -0,0 +1,10 @@ +{ + "test_pytest_mpl.test_hash_succeeds": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test.test_modified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_new": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_unmodified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test_formats.test_format_eps": "4a605a2cd24101b9292151f5ab6d6846ba1b9c856cfda2bee6a142380e257b04", + "test_formats.test_format_pdf": "34a9eb10372b35c0bd26472e8571a91031c055ab47cc3682ebc0c5e47c2b6cbd", + "test_formats.test_format_png": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test_formats.test_format_svg": "b7f85f4b44e0c5871f5cc230b5a9042f2e73aa70384ab584d6cd8cde29344cd2" +} diff --git a/tests/baseline/hashes/mpl35_ft261.json b/tests/baseline/hashes/mpl35_ft261.json new file mode 100644 index 0000000..5abbe0d --- /dev/null +++ b/tests/baseline/hashes/mpl35_ft261.json @@ -0,0 +1,10 @@ +{ + "test_pytest_mpl.test_hash_succeeds": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test.test_modified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_new": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_unmodified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test_formats.test_format_eps": "eafdced089e99355680744ac0b03d0beb3908c356c15f42e3fb299fa96cce46b", + "test_formats.test_format_pdf": "43ff9cc711b1d5e94bb904fc0ba872ea1c0a3fc778ed6eb705c5fc9305928c6b", + "test_formats.test_format_png": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test_formats.test_format_svg": "43a859a3642b9ce15578d25c6fd7d13edfee3a18457949a1ed4e841a83aa2942" +} diff --git a/tests/baseline/hashes/mpl36_ft261.json b/tests/baseline/hashes/mpl36_ft261.json new file mode 100644 index 0000000..ef249c3 --- /dev/null +++ b/tests/baseline/hashes/mpl36_ft261.json @@ -0,0 +1,10 @@ +{ + "test_pytest_mpl.test_hash_succeeds": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test.test_modified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_new": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_unmodified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test_formats.test_format_eps": "f7a03867e26b8ae32ed6f22972dfdc571a974df80881dc24bb8f840681f2ac5f", + "test_formats.test_format_pdf": "492152532625c1c4ea404854b75923c5dae0c253873b3715edba29d93b326d07", + "test_formats.test_format_png": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test_formats.test_format_svg": "4d1390489561a93e5413071632cfdab79ca1efbebf55337af2ab462cf1d4b9db" +} diff --git a/tests/baseline/hashes/mpl37_ft261.json b/tests/baseline/hashes/mpl37_ft261.json new file mode 100644 index 0000000..d02bd2e --- /dev/null +++ b/tests/baseline/hashes/mpl37_ft261.json @@ -0,0 +1,10 @@ +{ + "test_pytest_mpl.test_hash_succeeds": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test.test_modified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_new": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_unmodified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test_formats.test_format_eps": "f7a03867e26b8ae32ed6f22972dfdc571a974df80881dc24bb8f840681f2ac5f", + "test_formats.test_format_pdf": "492152532625c1c4ea404854b75923c5dae0c253873b3715edba29d93b326d07", + "test_formats.test_format_png": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test_formats.test_format_svg": "cb648df098fa1dd1ba0ed81e6498d31a152a43c47882e2503d093f83306ff403" +} diff --git a/tests/baseline/hashes/mpl38_ft261.json b/tests/baseline/hashes/mpl38_ft261.json new file mode 100644 index 0000000..7104aec --- /dev/null +++ b/tests/baseline/hashes/mpl38_ft261.json @@ -0,0 +1,10 @@ +{ + "test_pytest_mpl.test_hash_succeeds": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test.test_modified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_new": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test.test_unmodified": "025d344bc9667222abc27f2d746618bce9da8ae44fa9afa1220ac83f230b4e4e", + "test_formats.test_format_eps": "f730e67270aeeb2a0bedee168d7c421b952cbf486ea371987cc4cea503a7d7ff", + "test_formats.test_format_pdf": "492152532625c1c4ea404854b75923c5dae0c253873b3715edba29d93b326d07", + "test_formats.test_format_png": "e73d228183ddfdced366191399cdecef9685d1248b852162f179750fc7b8b904", + "test_formats.test_format_svg": "6309fd2c3f328ca3c5614c58c118780c94035eb3690fc4b95d1923699b28ff8e" +} diff --git a/tests/test_pytest_mpl.py b/tests/test_pytest_mpl.py index f616570..fa9a7be 100644 --- a/tests/test_pytest_mpl.py +++ b/tests/test_pytest_mpl.py @@ -280,7 +280,7 @@ def test_succeeds(self): # hashlib @pytest.mark.skipif(not hash_library.exists(), reason="No hash library for this mpl version") -@pytest.mark.mpl_image_compare(hash_library=hash_library) +@pytest.mark.mpl_image_compare(hash_library=hash_library, deterministic=True) def test_hash_succeeds(): fig = plt.figure() ax = fig.add_subplot(1, 1, 1) @@ -291,7 +291,7 @@ def test_hash_succeeds(): TEST_FAILING_HASH = rf""" import pytest import matplotlib.pyplot as plt -@pytest.mark.mpl_image_compare(hash_library=r"{fail_hash_library}") +@pytest.mark.mpl_image_compare(hash_library=r"{fail_hash_library}", deterministic=True) def test_hash_fails(): fig = plt.figure() ax = fig.add_subplot(1,1,1) @@ -328,7 +328,7 @@ def test_hash_fails(tmp_path): import pytest import matplotlib.pyplot as plt @pytest.mark.mpl_image_compare(hash_library=r"{fail_hash_library}", - tolerance=2) + tolerance=2, deterministic=True) def test_hash_fail_hybrid(): fig = plt.figure() ax = fig.add_subplot(1,1,1) @@ -437,11 +437,11 @@ def plot(): ax = fig.add_subplot(1,1,1) ax.plot([1,2,2]) return fig -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(deterministic=True) def test_modified(): return plot() -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(deterministic=True) def test_new(): return plot() -@pytest.mark.mpl_image_compare +@pytest.mark.mpl_image_compare(deterministic=True) def test_unmodified(): return plot() """ @@ -668,6 +668,7 @@ def test_raises(): @pytest.mark.parametrize('use_hash_library', (False, True)) @pytest.mark.parametrize('passes', (False, True)) @pytest.mark.parametrize("file_format", ['eps', 'pdf', 'png', 'svg']) +@pytest.mark.skipif(not hash_library.exists(), reason="No hash library for this mpl version") def test_formats(pytester, use_hash_library, passes, file_format): """ Note that we don't test all possible formats as some do not compress well @@ -684,9 +685,6 @@ def test_formats(pytester, use_hash_library, passes, file_format): elif file_format == 'eps' and MPL_VERSION < Version('2.1'): pytest.skip('EPS hashes are only deterministic in Matplotlib 2.1 and above') - if MPL_VERSION >= Version('3.8'): - pytest.skip('No hash library in test suite for Matplotlib >= 3.8') - if use_hash_library and not sys.platform.startswith('linux'): pytest.skip('Hashes for vector graphics are only provided in the hash library for Linux')