Skip to content

Complete transfer of case_utils.guess_format #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2022
Merged

Complete transfer of case_utils.guess_format #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions case_utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,4 @@

__version__ = "0.3.0"

import typing
import warnings

import rdflib.util # type: ignore

from . import local_uuid


def guess_format(
fpath: str, fmap: typing.Optional[typing.Dict[str, str]] = None
) -> typing.Optional[str]:
warnings.warn(
"The functionality in case_utils.guess_format is now upstream. Please revise your code to use rdflib.util.guess_format. The function arguments remain the same. case_utils.guess_format will be removed in case_utils 0.4.0.",
DeprecationWarning,
)

return rdflib.util.guess_format(fpath, fmap) # type: ignore
2 changes: 1 addition & 1 deletion case_utils/case_file/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def main() -> None:

output_format = None
if args.output_format is None:
output_format = case_utils.guess_format(args.out_graph)
output_format = rdflib.util.guess_format(args.out_graph)
else:
output_format = args.output_format

Expand Down
2 changes: 1 addition & 1 deletion case_utils/case_sparql_construct/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def main() -> None:

output_format = None
if args.output_format is None:
output_format = case_utils.guess_format(args.out_graph)
output_format = rdflib.util.guess_format(args.out_graph)
else:
output_format = args.output_format

Expand Down
48 changes: 0 additions & 48 deletions tests/case_utils/test_guess_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,51 +64,3 @@ def test_rdflib_util_guess_format_jsonld() -> None:
assert (
rdflib.util.guess_format(PATH_TO_JSONLD) == "json-ld"
), "Failed to recognize .jsonld RDF file extension"


def test_case_utils_guess_format_ttl_default() -> None:
assert (
case_utils.guess_format(PATH_TO_TTL) == "turtle"
), "Failed to recognize .ttl RDF file extension"


@pytest.mark.xfail(
reason="Preserving behavior - rdflib 5.0.0 guess_format fmap argument overwrites base module's extension map",
strict=True,
)
def test_case_utils_guess_format_ttl_fmap() -> None:
assert (
case_utils.guess_format(PATH_TO_TTL, FMAP_XHTML_GRDDL) == "turtle"
), "Failed to recognize .ttl RDF file extension when using fmap"


def test_case_utils_guess_format_json_default() -> None:
assert (
case_utils.guess_format(PATH_TO_JSON) == "json-ld"
), "Failed to recognize .json RDF file extension"


@pytest.mark.xfail(
reason="Preserving behavior - rdflib 5.0.0 guess_format fmap argument overwrites base module's extension map",
strict=True,
)
def test_case_utils_guess_format_json_fmap() -> None:
assert (
case_utils.guess_format(PATH_TO_JSON, FMAP_XHTML_GRDDL) == "json-ld"
), "Failed to recognize .json RDF file extension when using fmap"


def test_case_utils_guess_format_jsonld_default() -> None:
assert (
case_utils.guess_format(PATH_TO_JSONLD) == "json-ld"
), "Failed to recognize .jsonld RDF file extension"


@pytest.mark.xfail(
reason="Preserving behavior - rdflib 5.0.0 guess_format fmap argument overwrites base module's extension map",
strict=True,
)
def test_case_utils_guess_format_jsonld_fmap() -> None:
assert (
case_utils.guess_format(PATH_TO_JSONLD, FMAP_XHTML_GRDDL) == "json-ld"
), "Failed to recognize .jsonld RDF file extension when using fmap"