Skip to content

Commit

Permalink
Merge branch 'release/2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosgoce committed Feb 13, 2016
2 parents 2f15d40 + 6653dc9 commit 99e2248
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
12 changes: 7 additions & 5 deletions README.rst
Expand Up @@ -48,6 +48,12 @@ Running the tests
Changelog
---------

2016-02-13

- Fix bug
- Add version 2.0.1


2016-01-05

- Flake8 file now is always generated, even when there are no errors
Expand All @@ -60,10 +66,6 @@ Changelog
- Renamed binary to flake8_junit


Contributions
-------------
.. _Authors: AUTHORS.rst

Check `authors file`_.

.. _authors file: AUTHORS.rst
`CONTRIBUTORS <https://github.com/initios/flake8-junit-report/graphs/contributors>`_
2 changes: 1 addition & 1 deletion junit_conversor/__about__.py
@@ -1,6 +1,6 @@
__title__ = 'flake8-junit-report'
__summary__ = 'Simple tool that converts a flake8 file to junit format'
__version__ = '2.0.0'
__version__ = '2.0.1'
__license__ = 'BSD 3-Clause License'
__uri__ = 'https://github.com/initios/flake8-junit-report'
__author__ = 'Carlos Goce'
Expand Down
2 changes: 1 addition & 1 deletion junit_conversor/__init__.py
Expand Up @@ -8,7 +8,7 @@ def _parse(file_name):
parsed = defaultdict(list)

for line in lines:
splitted = line.split(":")
splitted = line.split(":", 3)

# Skip invalid lines
if len(splitted) == 4:
Expand Down
2 changes: 1 addition & 1 deletion requirements_ci.txt
@@ -1,2 +1,2 @@
-r requirements_dev.txt
flake8-junit-report==2.0.0.dev0
flake8-junit-report==2.0.1
1 change: 1 addition & 0 deletions tests/flake8_example_results/failed_flake8.txt
@@ -1,3 +1,4 @@
tests/subject/__init__.py:1:1: F401 'os' imported but unused
tests/subject/__init__.py:3:1: E302 expected 2 blank lines, found 1
tests/subject/example.py:4:1: E302 expected 2 blank lines, found 1
tests/subject/example.py:16:22: E203 whitespace before ':'
1 change: 1 addition & 0 deletions tests/tests.py
Expand Up @@ -45,6 +45,7 @@ def test_should_parse_a_flake8_file_with_errors(self):
],
"tests/subject/example.py": [
{"file": "tests/subject/example.py", "line": "4", "col": "1", "detail": "E302 expected 2 blank lines, found 1", "code": "E302"},
{"file": "tests/subject/example.py", "line": "16", "col": "22", "detail": "E203 whitespace before ':'", "code": "E203"},
]
})

Expand Down

0 comments on commit 99e2248

Please sign in to comment.