Separate sections by two empty lines (#276)

Author: bhirsz

CHANGES.md

@@ -1,6 +1,36 @@
 # Change Log
 
-## Unreleased
+## 2.1
+
+### Transformers
+- Updated `NormalizeNewLines` to separate sections by two empty lines (instead of one). It's effort of normalizing 
+  Robocop output (which suggest to use 2 empty lines) and Robotidy (which previously transformed with 1 empty line) ([#536](https://github.com/MarketSquare/robotframework-robocop/issues/536)).
+
+  Previously:
+  ```
+  *** Settings ***
+  Force Tags    tag
+  
+  *** Test Cases ***
+  Test
+      No Operation
+  ```
+  
+  Now:
+  ```
+  *** Settings ***
+  Force Tags    tag
+  
+  
+  *** Test Cases ***
+  Test
+      No Operation
+  ```
+
+### Other
+- Add missing packaging dependency ([#275](https://github.com/MarketSquare/robotframework-tidy/issues/275))
+
+## 2.0.0
 
 ### Transformers
 - New `ReplaceReturns` transformer that replaces return statements (such as `[Return]` setting or `Return From Keyword` keyword) with `RETURN` statement ([#231](https://github.com/MarketSquare/robotframework-tidy/issues/231))

robotidy/transformers/NormalizeNewLines.py

@@ -29,7 +29,7 @@ def __init__(
         self,
         test_case_lines: int = 1,
         keyword_lines: Optional[int] = None,
-        section_lines: int = 1,
+        section_lines: int = 2,
         separate_templated_tests: bool = False,
         consecutive_lines: int = 1,
     ):

robotidy/version.py

@@ -1 +1 @@
-__version__ = "2.0"
+__version__ = "2.1"

tests/atest/transformers/MergeAndOrderSections/expected/inline_if.robot

@@ -69,4 +69,4 @@ def test_invalid_order_parameter(self, parameter):
         assert expected_output == result.output
 
     def test_inline_if(self):
-        self.compare("inline_if.robot")
+        self.compare(source="inline_if.robot", not_modified=True)

tests/atest/transformers/MergeAndOrderSections/test_transformer.py

@@ -3,6 +3,7 @@ Resource    resource.robot
 Default Tags    tag
 Documentation    doc
 
+
 *** Test Cases ***
 Test Capitalized
     Pass Execution
@@ -18,6 +19,7 @@ Test with first letter capitalized
 #  no test case name
     Log To Console  hello
 
+
 *** Keywords ***
 Keyword
     Empty Line Before

tests/atest/transformers/NormalizeNewLines/expected/consecutive_empty_lines_0line.robot

@@ -5,6 +5,7 @@ Default Tags    tag
 
 Documentation    doc
 
+
 *** Test Cases ***
 Test Capitalized
     Pass Execution
@@ -21,6 +22,7 @@ Test with first letter capitalized
 #  no test case name
     Log To Console  hello
 
+
 *** Keywords ***
 Keyword
     Empty Line Before

tests/atest/transformers/NormalizeNewLines/expected/consecutive_empty_lines_1line.robot

@@ -6,6 +6,7 @@ Default Tags    tag
 
 Documentation    doc
 
+
 *** Test Cases ***
 Test Capitalized
     Pass Execution
@@ -23,6 +24,7 @@ Test with first letter capitalized
 #  no test case name
     Log To Console  hello
 
+
 *** Keywords ***
 Keyword
     Empty Line Before

tests/atest/transformers/NormalizeNewLines/expected/consecutive_empty_lines_2line.robot

@@ -2,6 +2,7 @@
 foo
     No Operation
 
+
 *** Keywords ***
 Bar
     IF    ${True}    No Operation

tests/atest/transformers/NormalizeNewLines/expected/inline_if.robot

@@ -1,18 +1,21 @@
 This data is ignored at runtime but should be preserved by Tidy.
 
+
 *** Variables ***
 # standalone      comment
 ${VALID}          Value
 MyVar             val1    val2    val3    val4    val5    val6    val7
 ...               val8    val9    val10    # var comment
 # standalone
 
+
 *** Test Cases ***
 Test    arg1   arg2
 Test Without Arg
 Mid Test
     My Step 1    args    args 2    args 3
 
+
 *** Keywords ***
 Keyword
     No Operation
@@ -24,6 +27,7 @@ Another Keyword
     Are
     More
 
+
 *** Settings ***
 Library  library.py
 Test Template  Template For Tests In This Suite