From 3db3967a6505828be1c61b9b5496e5817d2f70ab Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 21 Jun 2023 11:29:19 -0400 Subject: [PATCH 1/2] fix pytest-maint merge conflict --- datalad_catalog/extractors/tests/test_datacite_gin.py | 2 +- datalad_catalog/tests/register.py | 2 +- datalad_catalog/tests/test_catalog.py | 2 +- datalad_catalog/tests/test_catalog_arguments.py | 2 +- datalad_catalog/tests/test_translate.py | 5 +++++ requirements-devel.txt | 1 - setup.cfg | 1 - 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/datalad_catalog/extractors/tests/test_datacite_gin.py b/datalad_catalog/extractors/tests/test_datacite_gin.py index b279a293..1cfdb526 100644 --- a/datalad_catalog/extractors/tests/test_datacite_gin.py +++ b/datalad_catalog/extractors/tests/test_datacite_gin.py @@ -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, ) diff --git a/datalad_catalog/tests/register.py b/datalad_catalog/tests/register.py index ac8e8f33..23046400 100644 --- a/datalad_catalog/tests/register.py +++ b/datalad_catalog/tests/register.py @@ -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): diff --git a/datalad_catalog/tests/test_catalog.py b/datalad_catalog/tests/test_catalog.py index 25654a54..ff56c5d9 100644 --- a/datalad_catalog/tests/test_catalog.py +++ b/datalad_catalog/tests/test_catalog.py @@ -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, diff --git a/datalad_catalog/tests/test_catalog_arguments.py b/datalad_catalog/tests/test_catalog_arguments.py index c3da3a7d..66bea9ce 100644 --- a/datalad_catalog/tests/test_catalog_arguments.py +++ b/datalad_catalog/tests/test_catalog_arguments.py @@ -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, ) diff --git a/datalad_catalog/tests/test_translate.py b/datalad_catalog/tests/test_translate.py index 5aab1fe7..52b9f6d3 100644 --- a/datalad_catalog/tests/test_translate.py +++ b/datalad_catalog/tests/test_translate.py @@ -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" diff --git a/requirements-devel.txt b/requirements-devel.txt index 81e5ebeb..714c7dbf 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -7,7 +7,6 @@ pyyaml # requirements for a development environment pytest pytest-cov -nose coverage # requirements for a document building diff --git a/setup.cfg b/setup.cfg index c08a0139..45793748 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 From e44fd98ee5fa98c48ae460e284c50d1e2e6fae09 Mon Sep 17 00:00:00 2001 From: Stephan Heunis Date: Thu, 1 Jun 2023 13:39:42 +0200 Subject: [PATCH 2/2] fix deprecated intersphinx mapping format --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index e2d47050..279295a3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -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 ----------------------------------------------