various: comma fixes (exercism#2150)

* forth: reinstate seperate classes The template removed seperate classes per major case, resulting in several tests with duplicate names and therefore an incomplete test suite. This reinstates the distinct classes. Fixesexercism#2148 * forth: minor black issue Was accidentally running on a later version of Black than the one specified in our requirements-generator.txt. * various: fixes trailing comma issues An upcoming change in Black revealed that we were adding unnecessary trailing commas. These will _not_ be trimmed by Black in future builds. Co-authored-by: Corey McCandless <[email protected]>

Author: yawpitch

.gitignore

@@ -12,3 +12,4 @@ bin/configlet.exe
 .cache
 .pytest_cache
 __pycache__
+.venv

exercises/all-your-base/.meta/template.j2

@@ -3,7 +3,7 @@
 {%- macrofunc_call(case) -%}
 {{case["property"] }}(
 {%forargincase["input"].values() %}
-{{arg }},
+{{arg }}{{- "," if not loop.last }}
 {%endfor%}
  )
 {%- endmacro -%}

exercises/complex-numbers/.meta/template.j2

@@ -10,7 +10,7 @@ import math
 
 {%- macroformatValue(val) -%}
 {%ifvalisiterableandvalisnotstring -%}
- ComplexNumber({%forpartinval%}{{translate_math(part) }},{%endfor%})
+ ComplexNumber({%forpartinval%}{{translate_math(part) }}{{"," if not loop.last }}{%endfor%})
 {%- else -%}
 {{translate_math(val) }}
 {%- endif -%}

exercises/dominoes/.meta/template.j2

@@ -4,7 +4,7 @@
 {%macrotuplify(dominoes_list) -%}
  [
 {%- forvindominoes_list%}
- ({{v | join(', ') }}),
+ ({{v | join(', ') }}){{- "," if not loop.last }}
 {%- endfor%}
  ]
 {%- endmacro%}

exercises/etl/.meta/template.j2

@@ -3,7 +3,7 @@
 {%- setinput = case["input"] -%}
  def test_{{case["description"] | to_snake }}(self):
  legacy_data ={{%forkey, valueincase["input"]["legacy"].items() %}
-{{key}}:{{value}},{%endfor%} }
+{{key}}:{{value}}{{"," if not loop.last }}{%endfor%} }
  data ={{case["expected"]}}
  self.assertEqual(
 {{case["property"] | to_snake }}(legacy_data), data

exercises/go-counting/.meta/template.j2

@@ -5,7 +5,7 @@
 {%- ifterritory_list%}
 {
 {%- forvinterritory_list%}
- ({{v | join(', ') }}),
+ ({{v | join(', ') }}){{"," if not loop.last }}
 {%- endfor%}
  }
 {%- else%}

exercises/hamming/.meta/template.j2

@@ -2,7 +2,7 @@
 {%- macrotest_call(case) %}
 {{case["property"] }}(
 {%forargincase["input"].values() -%}
- "{{arg }}",
+ "{{arg }}"{{"," if not loop.last }}
 {%endfor%}
  )
 {%endmacro -%}

exercises/isogram/.meta/template.j2

@@ -2,7 +2,7 @@
 {%- macrotest_call(case) %}
 {{case["property"] | to_snake }}(
 {%forargincase["input"].values() -%}
- "{{arg }}",
+ "{{arg }}"{{"," if not loop.last }}
 {%endfor%}
  )
 {%endmacro -%}

exercises/kindergarten-garden/.meta/template.j2

@@ -13,7 +13,7 @@
  garden.{{- case["property"] | to_snake -}}
  ("{{input["student"] }}"),
  [{%forvalincase["expected"] -%}
- "{{val | camel_case }}",
+ "{{val | camel_case }}"{{- "," if not loop.last }}
 {%endfor%}]
  )
 {%endmacro -%}

exercises/pov/.meta/template.j2

@@ -34,7 +34,7 @@
  Tree("{{tree["label"] }}"
 {%- iftree["children"] %}, [
 {%- forchild_treeintree["children"] %}
-{{write_tree(child_tree) | indent(4,True,True) }},
+{{write_tree(child_tree) | indent(4,True,True) }}{{- "," if not loop.last }}
 {%- endfor%}
  ]{%endif%})
 {%- endmacro -%}