trackler 2.2.1.110 → 2.2.1.111

data/tracks/python/exercises/prime-factors/README.md

@@ -37,12 +37,30 @@ every exercise will require you to raise an exception, but for those that do, th
 a message.
 
 To raise a message with an exception, just write it as an argument to the exception type. For example, instead of
-`raise Exception`, you shold write:
+`raise Exception`, you should write:
 
 ```python
 raise Exception("Meaningful message indicating the source of the error")
 ```
 
+## Running the tests
+
+To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
+
+- Python 2.7: `py.test prime_factors_test.py`
+- Python 3.3+: `pytest prime_factors_test.py`
+
+Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
+`python -m pytest prime_factors_test.py`
+
+### Common `pytest` options
+
+- `-v` : enable verbose output
+- `-x` : stop running tests on first failure
+- `--ff` : run failures from previous test before running other test cases
+
+For other options, see `python -m pytest -h`
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `$EXERCISM_WORKSPACE/python/prime-factors` directory.
@@ -57,4 +75,5 @@ please see the [help page](http://exercism.io/languages/python).
 The Prime Factors Kata by Uncle Bob [http://butunclebob.com/ArticleS.UncleBob.ThePrimeFactorsKata](http://butunclebob.com/ArticleS.UncleBob.ThePrimeFactorsKata)
 
 ## Submitting Incomplete Solutions
+
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/protein-translation/README.md

@@ -49,12 +49,30 @@ every exercise will require you to raise an exception, but for those that do, th
 a message.
 
 To raise a message with an exception, just write it as an argument to the exception type. For example, instead of
-`raise Exception`, you shold write:
+`raise Exception`, you should write:
 
 ```python
 raise Exception("Meaningful message indicating the source of the error")
 ```
 
+## Running the tests
+
+To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
+
+- Python 2.7: `py.test protein_translation_test.py`
+- Python 3.3+: `pytest protein_translation_test.py`
+
+Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
+`python -m pytest protein_translation_test.py`
+
+### Common `pytest` options
+
+- `-v` : enable verbose output
+- `-x` : stop running tests on first failure
+- `--ff` : run failures from previous test before running other test cases
+
+For other options, see `python -m pytest -h`
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `$EXERCISM_WORKSPACE/python/protein-translation` directory.
@@ -69,4 +87,5 @@ please see the [help page](http://exercism.io/languages/python).
 Tyler Long
 
 ## Submitting Incomplete Solutions
+
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/proverb/README.md

@@ -24,12 +24,30 @@ every exercise will require you to raise an exception, but for those that do, th
 a message.
 
 To raise a message with an exception, just write it as an argument to the exception type. For example, instead of
-`raise Exception`, you shold write:
+`raise Exception`, you should write:
 
 ```python
 raise Exception("Meaningful message indicating the source of the error")
 ```
 
+## Running the tests
+
+To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
+
+- Python 2.7: `py.test proverb_test.py`
+- Python 3.3+: `pytest proverb_test.py`
+
+Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
+`python -m pytest proverb_test.py`
+
+### Common `pytest` options
+
+- `-v` : enable verbose output
+- `-x` : stop running tests on first failure
+- `--ff` : run failures from previous test before running other test cases
+
+For other options, see `python -m pytest -h`
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `$EXERCISM_WORKSPACE/python/proverb` directory.
@@ -44,4 +62,5 @@ please see the [help page](http://exercism.io/languages/python).
 Wikipedia [http://en.wikipedia.org/wiki/For_Want_of_a_Nail](http://en.wikipedia.org/wiki/For_Want_of_a_Nail)
 
 ## Submitting Incomplete Solutions
+
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/pythagorean-triplet/README.md

@@ -25,12 +25,30 @@ every exercise will require you to raise an exception, but for those that do, th
 a message.
 
 To raise a message with an exception, just write it as an argument to the exception type. For example, instead of
-`raise Exception`, you shold write:
+`raise Exception`, you should write:
 
 ```python
 raise Exception("Meaningful message indicating the source of the error")
 ```
 
+## Running the tests
+
+To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
+
+- Python 2.7: `py.test pythagorean_triplet_test.py`
+- Python 3.3+: `pytest pythagorean_triplet_test.py`
+
+Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
+`python -m pytest pythagorean_triplet_test.py`
+
+### Common `pytest` options
+
+- `-v` : enable verbose output
+- `-x` : stop running tests on first failure
+- `--ff` : run failures from previous test before running other test cases
+
+For other options, see `python -m pytest -h`
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `$EXERCISM_WORKSPACE/python/pythagorean-triplet` directory.
@@ -45,4 +63,5 @@ please see the [help page](http://exercism.io/languages/python).
 Problem 9 at Project Euler [http://projecteuler.net/problem=9](http://projecteuler.net/problem=9)
 
 ## Submitting Incomplete Solutions
+
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/queen-attack/README.md

@@ -34,12 +34,30 @@ every exercise will require you to raise an exception, but for those that do, th
 a message.
 
 To raise a message with an exception, just write it as an argument to the exception type. For example, instead of
-`raise Exception`, you shold write:
+`raise Exception`, you should write:
 
 ```python
 raise Exception("Meaningful message indicating the source of the error")
 ```
 
+## Running the tests
+
+To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
+
+- Python 2.7: `py.test queen_attack_test.py`
+- Python 3.3+: `pytest queen_attack_test.py`
+
+Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
+`python -m pytest queen_attack_test.py`
+
+### Common `pytest` options
+
+- `-v` : enable verbose output
+- `-x` : stop running tests on first failure
+- `--ff` : run failures from previous test before running other test cases
+
+For other options, see `python -m pytest -h`
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `$EXERCISM_WORKSPACE/python/queen-attack` directory.
@@ -54,4 +72,5 @@ please see the [help page](http://exercism.io/languages/python).
 J Dalbey's Programming Practice problems [http://users.csc.calpoly.edu/~jdalbey/103/Projects/ProgrammingPractice.html](http://users.csc.calpoly.edu/~jdalbey/103/Projects/ProgrammingPractice.html)
 
 ## Submitting Incomplete Solutions
+
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/queen-attack/example.py

@@ -1,27 +1,17 @@
-def board(pos1, pos2):
-    validate_position(pos1, pos2)
-    x1, y1 = pos1
-    x2, y2 = pos2
-    b = [['_'] * 8 for i in range(8)]
-    b[x1][y1] = 'W'
-    b[x2][y2] = 'B'
-    return [''.join(r) for r in b]
+class Queen(object):
+    def __init__(self, row, column):
+        if not 0 <= row <= 7 or not 0 <= column <= 7:
+            raise ValueError("Invalid queen position: queen out of the board")
+        self.row = row
+        self.column = column
 
-
-def can_attack(pos1, pos2):
-    validate_position(pos1, pos2)
-    x1, y1 = pos1
-    x2, y2 = pos2
-    dx = x1 - x2 if x1 >= x2 else x2 - x1
-    dy = y1 - y2 if y1 >= y2 else y2 - y1
-    if dx == dy or dx == 0 or dy == 0:
-        return True
-    return False
-
-
-def validate_position(pos1, pos2):
-    if any(x < 0 or x > 7 for x in pos1 + pos2):
-        raise ValueError('Invalid queen position: queen out of the board')
-    if pos1 == pos2:
-        raise ValueError('Invalid queen position: both queens in the same '
-                         'square: {0}'.format(pos1))
+    def can_attack(self, another_queen):
+        dx = abs(self.row - another_queen.row)
+        dy = abs(self.column - another_queen.column)
+        if dx == dy == 0:
+            raise ValueError(
+                'Invalid queen position: both queens in the same square')
+        elif dx == dy or dx == 0 or dy == 0:
+            return True
+        else:
+            return False

data/tracks/python/exercises/queen-attack/queen_attack.py

@@ -1,6 +1,6 @@
-def board(white_position, black_position):
-    pass
+class Queen(object):
+    def __init__(self, row, column):
+        pass
 
-
-def can_attack(white_position, black_position):
-    pass
+    def can_attack(self, another_queen):
+        pass

data/tracks/python/exercises/queen-attack/queen_attack_test.py

@@ -1,92 +1,61 @@
 import unittest
 
-from queen_attack import board, can_attack
+from queen_attack import Queen
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v2.0.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v2.1.0
 
 class QueenAttackTest(unittest.TestCase):
 
+    # Test creation of Queens with valid and invalid positions
     def test_queen_valid_position(self):
         try:
-            board((1, 1), (2, 2))
+            Queen(2, 2)
         except ValueError:
             self.fail("Unexpected Exception")
 
     def test_queen_negative_row(self):
         with self.assertRaisesWithMessage(ValueError):
-            board((1, 1), (-2, 2))
+            Queen(-2, 2)
 
     def test_queen_invalid_row(self):
         with self.assertRaisesWithMessage(ValueError):
-            board((1, 1), (8, 4))
+            Queen(8, 4)
 
     def test_queen_negative_column(self):
         with self.assertRaisesWithMessage(ValueError):
-            board((1, 1), (2, -2))
+            Queen(2, -2)
 
     def test_queen_invalid_column(self):
         with self.assertRaisesWithMessage(ValueError):
-            board((1, 1), (4, 8))
+            Queen(4, 8)
 
+    # Test the ability of one queen to attack another
     def test_attack_false(self):
-        self.assertIs(can_attack((2, 4), (6, 6)), False)
+        self.assertIs(Queen(2, 4).can_attack(Queen(6, 6)), False)
 
     def test_attack_same_row(self):
-        self.assertIs(can_attack((2, 4), (2, 6)), True)
+        self.assertIs(Queen(2, 4).can_attack(Queen(2, 6)), True)
 
     def test_attack_same_column(self):
-        self.assertIs(can_attack((4, 5), (2, 5)), True)
+        self.assertIs(Queen(4, 5).can_attack(Queen(2, 5)), True)
 
     def test_attack_diagonal1(self):
-        self.assertIs(can_attack((2, 2), (0, 4)), True)
+        self.assertIs(Queen(2, 2).can_attack(Queen(0, 4)), True)
 
     def test_attack_diagonal2(self):
-        self.assertIs(can_attack((2, 2), (3, 1)), True)
+        self.assertIs(Queen(2, 2).can_attack(Queen(3, 1)), True)
 
     def test_attack_diagonal3(self):
-        self.assertIs(can_attack((2, 2), (1, 1)), True)
+        self.assertIs(Queen(2, 2).can_attack(Queen(1, 1)), True)
 
     def test_attack_diagonal4(self):
-        self.assertIs(can_attack((2, 2), (5, 5)), True)
-
-    # Tests beyond this point are not part of the canonical data.
-
-    # If either board or can_attack are called with an invalid board position
-    # they should raise a ValueError with a meaningful error message.
-    def test_invalid_position_can_attack(self):
-        with self.assertRaisesWithMessage(ValueError):
-            can_attack((0, 0), (7, 8))
-
-    def test_queens_same_position_board(self):
-        with self.assertRaisesWithMessage(ValueError):
-            board((2, 2), (2, 2))
+        self.assertIs(Queen(2, 2).can_attack(Queen(5, 5)), True)
 
+    # Track-specific tests
     def test_queens_same_position_can_attack(self):
         with self.assertRaisesWithMessage(ValueError):
-            can_attack((2, 2), (2, 2))
-
-    def test_board1(self):
-        ans = ['________',
-               '________',
-               '___W____',
-               '________',
-               '________',
-               '______B_',
-               '________',
-               '________']
-        self.assertEqual(board((2, 3), (5, 6)), ans)
-
-    def test_board2(self):
-        ans = ['______W_',
-               '_______B',
-               '________',
-               '________',
-               '________',
-               '________',
-               '________',
-               '________']
-        self.assertEqual(board((0, 6), (1, 7)), ans)
+            Queen(2, 2).can_attack(Queen(2, 2))
 
     # Utility functions
     def setUp(self):

data/tracks/python/exercises/rail-fence-cipher/README.md

@@ -66,12 +66,30 @@ every exercise will require you to raise an exception, but for those that do, th
 a message.
 
 To raise a message with an exception, just write it as an argument to the exception type. For example, instead of
-`raise Exception`, you shold write:
+`raise Exception`, you should write:
 
 ```python
 raise Exception("Meaningful message indicating the source of the error")
 ```
 
+## Running the tests
+
+To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
+
+- Python 2.7: `py.test rail_fence_cipher_test.py`
+- Python 3.3+: `pytest rail_fence_cipher_test.py`
+
+Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
+`python -m pytest rail_fence_cipher_test.py`
+
+### Common `pytest` options
+
+- `-v` : enable verbose output
+- `-x` : stop running tests on first failure
+- `--ff` : run failures from previous test before running other test cases
+
+For other options, see `python -m pytest -h`
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `$EXERCISM_WORKSPACE/python/rail-fence-cipher` directory.
@@ -86,4 +104,5 @@ please see the [help page](http://exercism.io/languages/python).
 Wikipedia [https://en.wikipedia.org/wiki/Transposition_cipher#Rail_Fence_cipher](https://en.wikipedia.org/wiki/Transposition_cipher#Rail_Fence_cipher)
 
 ## Submitting Incomplete Solutions
+
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/raindrops/README.md

@@ -25,12 +25,30 @@ every exercise will require you to raise an exception, but for those that do, th
 a message.
 
 To raise a message with an exception, just write it as an argument to the exception type. For example, instead of
-`raise Exception`, you shold write:
+`raise Exception`, you should write:
 
 ```python
 raise Exception("Meaningful message indicating the source of the error")
 ```
 
+## Running the tests
+
+To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
+
+- Python 2.7: `py.test raindrops_test.py`
+- Python 3.3+: `pytest raindrops_test.py`
+
+Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
+`python -m pytest raindrops_test.py`
+
+### Common `pytest` options
+
+- `-v` : enable verbose output
+- `-x` : stop running tests on first failure
+- `--ff` : run failures from previous test before running other test cases
+
+For other options, see `python -m pytest -h`
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `$EXERCISM_WORKSPACE/python/raindrops` directory.
@@ -45,4 +63,5 @@ please see the [help page](http://exercism.io/languages/python).
 A variation on a famous interview question intended to weed out potential candidates. [http://jumpstartlab.com](http://jumpstartlab.com)
 
 ## Submitting Incomplete Solutions
+
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.

data/tracks/python/exercises/rational-numbers/README.md

@@ -36,12 +36,30 @@ every exercise will require you to raise an exception, but for those that do, th
 a message.
 
 To raise a message with an exception, just write it as an argument to the exception type. For example, instead of
-`raise Exception`, you shold write:
+`raise Exception`, you should write:
 
 ```python
 raise Exception("Meaningful message indicating the source of the error")
 ```
 
+## Running the tests
+
+To run the tests, run the appropriate command below ([why they are different](https://github.com/pytest-dev/pytest/issues/1629#issue-161422224)):
+
+- Python 2.7: `py.test rational_numbers_test.py`
+- Python 3.3+: `pytest rational_numbers_test.py`
+
+Alternatively, you can tell Python to run the pytest module (allowing the same command to be used regardless of Python version):
+`python -m pytest rational_numbers_test.py`
+
+### Common `pytest` options
+
+- `-v` : enable verbose output
+- `-x` : stop running tests on first failure
+- `--ff` : run failures from previous test before running other test cases
+
+For other options, see `python -m pytest -h`
+
 ## Submitting Exercises
 
 Note that, when trying to submit an exercise, make sure the solution is in the `$EXERCISM_WORKSPACE/python/rational-numbers` directory.
@@ -56,4 +74,5 @@ please see the [help page](http://exercism.io/languages/python).
 Wikipedia [https://en.wikipedia.org/wiki/Rational_number](https://en.wikipedia.org/wiki/Rational_number)
 
 ## Submitting Incomplete Solutions
+
 It's possible to submit an incomplete solution so you can see how others have completed the exercise.