Skip to content

Commit

Permalink
Quiesce pytest warnings (#916)
Browse files Browse the repository at this point in the history
* Skip doctest of deprecated format_number

* Don't return from test_compatible_classes_in_global_and_localedata

* Renovate conftest (and require pytest 6+)
  • Loading branch information
akx authored Nov 1, 2022
1 parent 52b83d3 commit bc9dc84
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
4 changes: 2 additions & 2 deletions babel/numbers.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,9 @@ def get_group_symbol(locale=LC_NUMERIC):
def format_number(number, locale=LC_NUMERIC):
u"""Return the given number formatted for a specific locale.
>>> format_number(1099, locale='en_US')
>>> format_number(1099, locale='en_US') # doctest: +SKIP
u'1,099'
>>> format_number(1099, locale='de_DE')
>>> format_number(1099, locale='de_DE') # doctest: +SKIP
u'1.099'
.. deprecated:: 2.6.0
Expand Down
24 changes: 15 additions & 9 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
from pathlib import Path

from _pytest.doctest import DoctestModule
from py.path import local

collect_ignore = ['tests/messages/data', 'setup.py']
babel_path = local(__file__).dirpath().join('babel')
babel_path = Path(__file__).parent / 'babel'


# Via the stdlib implementation of Path.is_relative_to in Python 3.9
def _is_relative(p1: Path, p2: Path) -> bool:
try:
p1.relative_to(p2)
return True
except ValueError:
return False


def pytest_collect_file(path, parent):
if babel_path.common(path) == babel_path:
if path.ext == ".py":
# TODO: remove check when dropping support for old Pytest
if hasattr(DoctestModule, "from_parent"):
return DoctestModule.from_parent(parent, fspath=path)
return DoctestModule(path, parent)
def pytest_collect_file(file_path: Path, parent):
if _is_relative(file_path, babel_path) and file_path.suffix == '.py':
return DoctestModule.from_parent(parent, path=file_path)
2 changes: 1 addition & 1 deletion tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def find_class(self, module, name):
(module, name))

with open(filename, 'rb') as f:
return Unpickler(f).load()
assert Unpickler(f).load()


def test_issue_601_no_language_name_but_has_variant():
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ envlist =

[testenv]
deps =
pytest
pytest>=6.0
pytest-cov
freezegun==0.3.12
backports.zoneinfo;python_version<"3.9"
Expand Down

0 comments on commit bc9dc84

Please sign in to comment.