Skip to content
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.

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

Update datalad.tests.utils imports #320

Merged
merged 2 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion datalad_catalog/extractors/tests/test_datacite_gin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import yaml
from datalad.api import meta_extract
from datalad.distribution.dataset import Dataset
from datalad.tests.utils import (
from datalad.tests.utils_pytest import (
assert_equal,
with_tempfile,
)
Expand Down
2 changes: 1 addition & 1 deletion datalad_catalog/tests/register.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datalad.tests.utils import assert_result_count
from datalad.tests.utils_pytest import assert_result_count


def register(tmp_path):
Expand Down
2 changes: 1 addition & 1 deletion datalad_catalog/tests/test_catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
)

from datalad.support.exceptions import InsufficientArgumentsError
from datalad.tests.utils import (
from datalad.tests.utils_pytest import (
assert_equal,
assert_in,
assert_raises,
Expand Down
2 changes: 1 addition & 1 deletion datalad_catalog/tests/test_catalog_arguments.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
from datalad.support.exceptions import InsufficientArgumentsError
from datalad.tests.utils import (
from datalad.tests.utils_pytest import (
assert_in_results,
assert_raises,
)
Expand Down
5 changes: 5 additions & 0 deletions datalad_catalog/tests/test_translate.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
Node,
WebCatalog,
)
from datalad.tests.utils_pytest import (
assert_in_results,
assert_raises,
assert_result_count,
)

tests_path = Path(__file__).resolve().parent
data_path = tests_path / "data"
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
todo_include_todos = True

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}

# -- Options for HTML output ----------------------------------------------

Expand Down
1 change: 0 additions & 1 deletion requirements-devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ pyyaml
# requirements for a development environment
pytest
pytest-cov
nose
coverage

# requirements for a document building
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ include_package_data = True
[options.extras_require]
# this matches the name used by -core and what is expected by some CI setups
devel =
nose
coverage
pytest

Expand Down