Skip to content

Commit

Permalink
Merge pull request asdf-format#1765 from braingram/drop_doctestplus
Browse files Browse the repository at this point in the history
drop doctestplus test dependency
  • Loading branch information
braingram authored Mar 4, 2024
2 parents 15e830d + 4ced129 commit 4a0064a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/s390x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
run: |
python3 -m venv --system-site-packages tests
source tests/bin/activate
pip3 install --upgrade pip setuptools pytest pytest-doctestplus pytest-remotedata
pip3 install --upgrade pip setuptools pytest pytest-remotedata
pip3 install -e .[all,tests]
pip3 list
python3 -m pytest --remote-data
2 changes: 1 addition & 1 deletion asdf/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ class _InheritDocstrings(type):
... def wiggle(self):
... pass
>>> B.wiggle.__doc__
u'Wiggle the thingamajig'
'Wiggle the thingamajig'
"""

def __init__(cls, name, bases, dct):
Expand Down
1 change: 1 addition & 0 deletions docs/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
collect_ignore = ["conf.py"]
8 changes: 2 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ tests = [
"lz4>=0.10",
"psutil",
"pytest>=7",
"pytest-doctestplus",
"pytest-remotedata",
]
[project.urls]
Expand Down Expand Up @@ -101,18 +100,15 @@ force-exclude = '''
[tool.pytest.ini_options]
testpaths = ['asdf', 'docs']
minversion = 4.6
norecursedirs = ['build', 'docs/_build', 'docs/sphinxext']
doctest_plus = 'enabled'
remote_data_strict = true
filterwarnings = [
'error',
'ignore:numpy.ndarray size changed:RuntimeWarning',
]
# Configuration for pytest-doctestplus
text_file_format = 'rst'
addopts = [
'--doctest-modules',
'--doctest-glob=*.rst',
'--color=yes',
'--doctest-rst',
'-rsxfE',
'-p no:legacypath',
]
Expand Down
2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ deps =
oldestdeps: minimum_dependencies
parallel: pytest-xdist
pytestdev: git+https://github.com/pytest-dev/pytest
# released versions of doctestplus aren't compatible with pytest-dev
pytestdev: git+https://github.com/scientific-python/pytest-doctestplus
extras = all,tests
# astropy will complain if the home directory is missing
pass_env = HOME
Expand Down

0 comments on commit 4a0064a

Please sign in to comment.