Skip to content

Commit

Permalink
Pin black in test_requirements to higher version to solve click com…
Browse files Browse the repository at this point in the history
…plaints (#1382)
  • Loading branch information
merelcht authored Mar 29, 2022
1 parent f51481b commit f7020f7
Show file tree
Hide file tree
Showing 20 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion test_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ adlfs>=2021.7.1, <=2022.2
bandit>=1.6.2, <2.0
behave==1.2.6
biopython~=1.73
black==21.5b1
blacken-docs==1.9.2
black~=22.0
compress-pickle[lz4]~=1.2.0
coverage[toml]
dask[complete]~=2021.10 # pinned by Snyk to avoid a vulnerability
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/geojson/test_geojson_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for GeoJSONDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for GeoJSONDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_geojson_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/holoviews/test_holoviews_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for HoloviewsWriter\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for HoloviewsWriter\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_hv_writer.save(dummy_hv_object)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/matplotlib/test_matplotlib_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for MatplotlibWriter\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for MatplotlibWriter\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_plot_writer.save(mock_single_plot)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/networkx/test_gml_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match "
fr"load version `{load_version}` for GMLDataSet\(.+\)"
rf"Save version `{save_version}` did not match "
rf"load version `{load_version}` for GMLDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_gml_data_set.save(dummy_graph_data)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/networkx/test_graphml_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match "
fr"load version `{load_version}` for GraphMLDataSet\(.+\)"
rf"Save version `{save_version}` did not match "
rf"load version `{load_version}` for GraphMLDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_graphml_data_set.save(dummy_graph_data)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/networkx/test_json_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for JSONDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for JSONDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_json_data_set.save(dummy_graph_data)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pandas/test_csv_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for CSVDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for CSVDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_csv_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pandas/test_excel_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for ExcelDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for ExcelDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_excel_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pandas/test_feather_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for FeatherDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for FeatherDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_feather_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pandas/test_generic_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for GenericDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for GenericDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_csv_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pandas/test_hdf_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for HDFDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for HDFDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_hdf_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pandas/test_json_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for JSONDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for JSONDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_json_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pandas/test_parquet_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for ParquetDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for ParquetDataSet\(.+\)"
)
mocker.patch(
"pyarrow.fs._ensure_filesystem",
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pandas/test_xml_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match "
fr"load version `{load_version}` for XMLDataSet\(.+\)"
rf"Save version `{save_version}` did not match "
rf"load version `{load_version}` for XMLDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_xml_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pickle/test_pickle_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for PickleDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for PickleDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_pickle_data_set.save(dummy_dataframe)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/pillow/test_image_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for ImageDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for ImageDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_image_dataset.save(image_object)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/text/test_text_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for TextDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for TextDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_txt_data_set.save(STRING)
Expand Down
4 changes: 2 additions & 2 deletions tests/extras/datasets/yaml/test_yaml_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ def test_save_version_warning(
"""Check the warning when saving to the path that differs from
the subsequent load path."""
pattern = (
fr"Save version `{save_version}` did not match load version "
fr"`{load_version}` for YAMLDataSet\(.+\)"
rf"Save version `{save_version}` did not match load version "
rf"`{load_version}` for YAMLDataSet\(.+\)"
)
with pytest.warns(UserWarning, match=pattern):
versioned_yaml_data_set.save(dummy_data)
Expand Down
4 changes: 2 additions & 2 deletions tests/runner/test_parallel_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ def test_memory_dataset_not_serializable(self, is_async, catalog, hook_manager):
pipeline = Pipeline([node(return_not_serializable, "A", "B")])
catalog.add_feed_dict(feed_dict=dict(A=42))
pattern = (
fr"{str(data.__class__)} cannot be serialized. ParallelRunner implicit "
fr"memory datasets can only be used with serializable data"
rf"{str(data.__class__)} cannot be serialized. ParallelRunner implicit "
rf"memory datasets can only be used with serializable data"
)

with pytest.raises(DataSetError, match=pattern):
Expand Down

0 comments on commit f7020f7

Please sign in to comment.