Skip to content

Commit

Permalink
Explicitly define markers
Browse files Browse the repository at this point in the history
  • Loading branch information
jacebrowning committed May 22, 2019
1 parent 99f2e2b commit ca16ce8
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
8 changes: 4 additions & 4 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ classifiers = [
python = "^3.7"

# Formats
"ruamel.yaml" = "~0.15.46"
"ruamel.yaml" = "~0.15.96"
tomlkit = "^0.5.3"

# Utilities
Expand All @@ -65,7 +65,7 @@ pylint = "^2.1"
pydocstyle = "*"

# Testing
pytest = "^4.3.1"
pytest = "^4.5.0"
pytest-describe = "*"
pytest-expecter = "*"
pytest-mock = "*"
Expand Down
3 changes: 3 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ cache_dir = .cache
log_level = DEBUG
log_format = %(relpath)s:%(lineno)-4d %(levelname)5s: %(message)s

markers =
flaky

[pytest-watch]

ignore =.cache,htmlcov,tml
Expand Down
2 changes: 1 addition & 1 deletion tests/test_saving.py
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def with_comments_in_nested_objects(write, logbreak, expect, read, dedent):
"""
)

@pytest.mark.xfail
@pytest.mark.xfail(reason="unknown ruamel.yaml bug")
def with_comments_on_nested_lines(write, expect, read, dedent):
sample = SampleWithNestingAndDefaults(None)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class Sample:

return Sample(1, Nested(name="b"), "a")

@pytest.mark.xfail
@pytest.mark.xfail(reason='https://github.com/jacebrowning/datafiles/issues/64')
def it_converts_attributes(expect, sample):
expect(sample.datafile.data) == {
'name': "a",
Expand Down

0 comments on commit ca16ce8

Please sign in to comment.