Skip to content

Commit

Permalink
Merge pull request #874 from Mathics3/pytest-without-scikit-image
Browse files Browse the repository at this point in the history
pytest succeeds without scikit-image
  • Loading branch information
rocky committed Jul 6, 2023
2 parents 541c281 + cc71ff5 commit e424b77
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
9 changes: 5 additions & 4 deletions test/builtin/drawing/test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import pytest

from mathics.builtin.base import check_requires_list
from mathics.core.symbols import SymbolNull

# Note we test with tif, jpg, and gif. Add others?
Expand Down Expand Up @@ -50,10 +51,10 @@
]


# @pytest.mark.skipif(
# not check_requires_list(["skimage"]),
# reason="scikit-image (AKA skimage) is needed for working with Images",
# )
@pytest.mark.skipif(
not check_requires_list(["skimage"]),
reason="Test doesn't work in a when scikit-image is not installed",
)
@pytest.mark.skipif(
os.getenv("SANDBOX", False),
reason="Test doesn't work in a sandboxed environment with access to local files",
Expand Down
5 changes: 3 additions & 2 deletions test/builtin/numbers/test_calculus.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"""
from test.helper import check_evaluation, evaluate
from test.helper import check_evaluation
from typing import Optional

import pytest
Expand Down Expand Up @@ -127,7 +127,8 @@ def test_integrate(str_expr: str, str_expected: str, assert_fail_message):
"D[{y, -x}[2], {x, y}]",
"D[{y, -x}[2], {x, y}]",
[
"Multiple derivative specifier {x, y} does not have the form {variable, n}, where n is a non-negative machine integer."
"Multiple derivative specifier {x, y} does not have the form {variable,"
" n}, where n is a non-negative machine integer."
],
),
], # Issue #502
Expand Down

0 comments on commit e424b77

Please sign in to comment.