Skip to content

Commit

Permalink
Remove xfails for put_strings added in #520
Browse files Browse the repository at this point in the history
  • Loading branch information
weiji14 committed Sep 2, 2020
1 parent 3f40842 commit c0bb8be
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
10 changes: 1 addition & 9 deletions pygmt/tests/test_clib.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,6 @@ def test_virtualfile_from_vectors():
assert output == expected


@pytest.mark.xfail(
condition=gmt_version < Version("6.1.1"),
reason="GMT_Put_Strings only works for GMT 6.1.1 and above",
)
def test_virtualfile_from_vectors_one_string_column():
"Test passing in one column with string dtype into virtual file dataset"
size = 5
Expand All @@ -421,10 +417,6 @@ def test_virtualfile_from_vectors_one_string_column():
assert output == expected


@pytest.mark.xfail(
condition=gmt_version < Version("6.1.1"),
reason="GMT_Put_Strings only works for GMT 6.1.1 and above",
)
def test_virtualfile_from_vectors_two_string_columns():
"Test passing in two columns of string dtype into virtual file dataset"
size = 5
Expand Down Expand Up @@ -688,7 +680,7 @@ def test_get_default():
with clib.Session() as lib:
assert lib.get_default("API_GRID_LAYOUT") in ["rows", "columns"]
assert int(lib.get_default("API_CORES")) >= 1
assert Version(lib.get_default("API_VERSION")) >= Version("6.1.0")
assert Version(lib.get_default("API_VERSION")) >= Version("6.1.1")


def test_get_default_fails():
Expand Down
4 changes: 0 additions & 4 deletions pygmt/tests/test_clib_put_strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
gmt_version = Version(_lib.info["version"])


@pytest.mark.xfail(
condition=gmt_version < Version("6.1.1"),
reason="GMT_Put_Strings only works for GMT 6.1.1 and above",
)
def test_put_strings():
"Check that assigning a numpy array of dtype str to a dataset works"
with clib.Session() as lib:
Expand Down

0 comments on commit c0bb8be

Please sign in to comment.