Skip to content

Commit 5bf10af

Browse files
committed
refac: Adding https://github.com/asottile/reorder_python_imports to pre-commit hooks
1 parent 345d823 commit 5bf10af

55 files changed

Lines changed: 143 additions & 106 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
37fcf9818178587635fffe1bb67a9fd5024a0a45
2+
345d82390af35d5d70ddd39c612faa4a64b11080

.pre-commit-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ repos:
99
rev: 22.10.0
1010
hooks:
1111
- id: black
12+
- repo: https://github.com/asottile/reorder_python_imports
13+
rev: v3.9.0
14+
hooks:
15+
- id: reorder-python-imports

docs/auto_examples/all_actions_machine.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"outputs": [],
2828
"source": [
29-
"import mock\n\nfrom statemachine import StateMachine, State\n\n\nclass AllActionsMachine(StateMachine):\n\n initial = State(\"Initial\", initial=True)\n final = State(\"Final\", final=True)\n\n go = initial.to(\n final,\n validators=[\"validation_1\", \"validation_2\"],\n cond=[\"condition_1\", \"condition_2\"],\n unless=[\"unless_1\", \"unless_2\"],\n on=[\"on_inline_1\", \"on_inline_2\"],\n before=[\"before_go_inline_1\", \"before_go_inline_2\"],\n after=[\"after_go_inline_1\", \"after_go_inline_2\"],\n )\n\n def __init__(self, *args, **kwargs):\n self.spy = mock.Mock(side_effect=lambda x: x)\n super(AllActionsMachine, self).__init__(*args, **kwargs)\n\n # validators and guards\n\n def validation_1(self):\n # this method may raise an exception\n return self.spy(\"validation_1\")\n\n def validation_2(self):\n # this method may raise an exception\n return self.spy(\"validation_2\")\n\n def condition_1(self):\n self.spy(\"condition_1\")\n return True\n\n def condition_2(self):\n self.spy(\"condition_2\")\n return True\n\n def unless_1(self):\n self.spy(\"unless_1\")\n return False\n\n def unless_2(self):\n self.spy(\"unless_2\")\n return False\n\n # generics state\n\n def on_enter_state(self):\n return self.spy(\"on_enter_state\")\n\n def on_exit_state(self):\n return self.spy(\"on_exit_state\")\n\n # generics transition\n\n def before_transition(self):\n return self.spy(\"before_transition\")\n\n def on_transition(self):\n return self.spy(\"on_transition\")\n\n def after_transition(self):\n return self.spy(\"after_transition\")\n\n # before / after specific\n\n @go.before\n def before_go_decor(self):\n return self.spy(\"before_go_decor\")\n\n def before_go_inline_1(self):\n return self.spy(\"before_go_inline_1\")\n\n def before_go_inline_2(self):\n return self.spy(\"before_go_inline_2\")\n\n def before_go(self):\n return self.spy(\"before_go\")\n\n @go.on\n def go_on_decor(self):\n return self.spy(\"go_on_decor\")\n\n def on_inline_1(self):\n return self.spy(\"on_inline_1\")\n\n def on_inline_2(self):\n return self.spy(\"on_inline_2\")\n\n def on_go(self):\n return self.spy(\"on_go\")\n\n @go.after\n def after_go_decor(self):\n return self.spy(\"after_go_decor\")\n\n def after_go_inline_1(self):\n return self.spy(\"after_go_inline_1\")\n\n def after_go_inline_2(self):\n return self.spy(\"after_go_inline_2\")\n\n def after_go(self):\n return self.spy(\"after_go\")\n\n # enter / exit specific\n\n @initial.enter\n def enter_initial_decor(self):\n return self.spy(\"enter_initial_decor\")\n\n def on_enter_initial(self):\n return self.spy(\"on_enter_initial\")\n\n @initial.exit\n def exit_initial_decor(self):\n return self.spy(\"exit_initial_decor\")\n\n def on_exit_initial(self):\n return self.spy(\"on_exit_initial\")\n\n def on_enter_final(self):\n return self.spy(\"on_enter_final\")\n\n def on_exit_final(self):\n \"hopefully this will not be called\"\n return self.spy(\"on_exit_final\")"
29+
"import mock\n\nfrom statemachine import State\nfrom statemachine import StateMachine\n\n\nclass AllActionsMachine(StateMachine):\n\n initial = State(\"Initial\", initial=True)\n final = State(\"Final\", final=True)\n\n go = initial.to(\n final,\n validators=[\"validation_1\", \"validation_2\"],\n cond=[\"condition_1\", \"condition_2\"],\n unless=[\"unless_1\", \"unless_2\"],\n on=[\"on_inline_1\", \"on_inline_2\"],\n before=[\"before_go_inline_1\", \"before_go_inline_2\"],\n after=[\"after_go_inline_1\", \"after_go_inline_2\"],\n )\n\n def __init__(self, *args, **kwargs):\n self.spy = mock.Mock(side_effect=lambda x: x)\n super(AllActionsMachine, self).__init__(*args, **kwargs)\n\n # validators and guards\n\n def validation_1(self):\n # this method may raise an exception\n return self.spy(\"validation_1\")\n\n def validation_2(self):\n # this method may raise an exception\n return self.spy(\"validation_2\")\n\n def condition_1(self):\n self.spy(\"condition_1\")\n return True\n\n def condition_2(self):\n self.spy(\"condition_2\")\n return True\n\n def unless_1(self):\n self.spy(\"unless_1\")\n return False\n\n def unless_2(self):\n self.spy(\"unless_2\")\n return False\n\n # generics state\n\n def on_enter_state(self):\n return self.spy(\"on_enter_state\")\n\n def on_exit_state(self):\n return self.spy(\"on_exit_state\")\n\n # generics transition\n\n def before_transition(self):\n return self.spy(\"before_transition\")\n\n def on_transition(self):\n return self.spy(\"on_transition\")\n\n def after_transition(self):\n return self.spy(\"after_transition\")\n\n # before / after specific\n\n @go.before\n def before_go_decor(self):\n return self.spy(\"before_go_decor\")\n\n def before_go_inline_1(self):\n return self.spy(\"before_go_inline_1\")\n\n def before_go_inline_2(self):\n return self.spy(\"before_go_inline_2\")\n\n def before_go(self):\n return self.spy(\"before_go\")\n\n @go.on\n def go_on_decor(self):\n return self.spy(\"go_on_decor\")\n\n def on_inline_1(self):\n return self.spy(\"on_inline_1\")\n\n def on_inline_2(self):\n return self.spy(\"on_inline_2\")\n\n def on_go(self):\n return self.spy(\"on_go\")\n\n @go.after\n def after_go_decor(self):\n return self.spy(\"after_go_decor\")\n\n def after_go_inline_1(self):\n return self.spy(\"after_go_inline_1\")\n\n def after_go_inline_2(self):\n return self.spy(\"after_go_inline_2\")\n\n def after_go(self):\n return self.spy(\"after_go\")\n\n # enter / exit specific\n\n @initial.enter\n def enter_initial_decor(self):\n return self.spy(\"enter_initial_decor\")\n\n def on_enter_initial(self):\n return self.spy(\"on_enter_initial\")\n\n @initial.exit\n def exit_initial_decor(self):\n return self.spy(\"exit_initial_decor\")\n\n def on_exit_initial(self):\n return self.spy(\"on_exit_initial\")\n\n def on_enter_final(self):\n return self.spy(\"on_enter_final\")\n\n def on_exit_final(self):\n \"hopefully this will not be called\"\n return self.spy(\"on_exit_final\")"
3030
]
3131
},
3232
{
@@ -105,4 +105,4 @@
105105
},
106106
"nbformat": 4,
107107
"nbformat_minor": 0
108-
}
108+
}

docs/auto_examples/all_actions_machine.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
A StateMachine that exercices all possible :ref:`Actions` and :ref:`Guards`.
66
77
"""
8-
98
import mock
109

11-
from statemachine import StateMachine, State
10+
from statemachine import State
11+
from statemachine import StateMachine
1212

1313

1414
class AllActionsMachine(StateMachine):
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a67dd8e6360bbc7795e9159cc1af0520
1+
ac78776e5717c75cacc8861a2f267168

docs/auto_examples/all_actions_machine.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ A StateMachine that exercices all possible :ref:`Actions` and :ref:`Guards`.
2727
2828
.. code-block:: default
2929
30-
3130
import mock
3231
33-
from statemachine import StateMachine, State
32+
from statemachine import State
33+
from statemachine import StateMachine
3434
3535
3636
class AllActionsMachine(StateMachine):

docs/auto_examples/guess_the_number_machine.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"outputs": [],
2828
"source": [
29-
"import random\nfrom statemachine import StateMachine, State\n\n\nclass GuessTheNumberMachine(StateMachine):\n\n start = State(\"Start\", initial=True)\n low = State(\"Low\")\n high = State(\"High\")\n won = State(\"Won\", final=True)\n lose = State(\"Lose\", final=True)\n\n guess = (\n lose.from_(low, high, cond=\"max_guesses_reached\")\n | won.from_(low, high, cond=\"guess_is_equal\")\n | low.from_(low, high, start, cond=\"guess_is_lower\")\n | high.from_(low, high, start, cond=\"guess_is_higher\")\n )\n\n def __init__(self, max_attempts=5, lower=1, higher=5, seed=42):\n self.max_attempts = max_attempts\n self.lower = lower\n self.higher = higher\n self.guesses = 0\n\n # lets play a not so random game, or our tests will be crazy\n random.seed(seed)\n self.number = random.randint(self.lower, self.higher)\n super(GuessTheNumberMachine, self).__init__()\n\n def max_guesses_reached(self):\n return self.guesses >= self.max_attempts\n\n def before_guess(self, number):\n self.guesses += 1\n print(\"You guess is {}...\".format(number))\n\n def guess_is_lower(self, number):\n return number < self.number\n\n def guess_is_higher(self, number):\n return number > self.number\n\n def guess_is_equal(self, number):\n return self.number == number\n\n def on_enter_start(self):\n print(\"(psss.. don't tell anyone the number is {})\".format(self.number))\n print(\n \"I'm thinking of a number between {} and {}. Can you guess what it is?\".format(\n self.lower, self.higher\n )\n )\n\n def on_enter_low(self):\n print(\"Too low. Try again.\")\n\n def on_enter_high(self):\n print(\"Too high. Try again.\")\n\n def on_enter_won(self):\n print(\n \"Congratulations, you guessed the number in {} guesses!\".format(\n self.guesses\n )\n )\n\n def on_enter_lose(self):\n print(\"Oh, no! You've spent all your {} attempts!\".format(self.guesses))"
29+
"import random\n\nfrom statemachine import State\nfrom statemachine import StateMachine\n\n\nclass GuessTheNumberMachine(StateMachine):\n\n start = State(\"Start\", initial=True)\n low = State(\"Low\")\n high = State(\"High\")\n won = State(\"Won\", final=True)\n lose = State(\"Lose\", final=True)\n\n guess = (\n lose.from_(low, high, cond=\"max_guesses_reached\")\n | won.from_(low, high, cond=\"guess_is_equal\")\n | low.from_(low, high, start, cond=\"guess_is_lower\")\n | high.from_(low, high, start, cond=\"guess_is_higher\")\n )\n\n def __init__(self, max_attempts=5, lower=1, higher=5, seed=42):\n self.max_attempts = max_attempts\n self.lower = lower\n self.higher = higher\n self.guesses = 0\n\n # lets play a not so random game, or our tests will be crazy\n random.seed(seed)\n self.number = random.randint(self.lower, self.higher)\n super(GuessTheNumberMachine, self).__init__()\n\n def max_guesses_reached(self):\n return self.guesses >= self.max_attempts\n\n def before_guess(self, number):\n self.guesses += 1\n print(\"You guess is {}...\".format(number))\n\n def guess_is_lower(self, number):\n return number < self.number\n\n def guess_is_higher(self, number):\n return number > self.number\n\n def guess_is_equal(self, number):\n return self.number == number\n\n def on_enter_start(self):\n print(\"(psss.. don't tell anyone the number is {})\".format(self.number))\n print(\n \"I'm thinking of a number between {} and {}. Can you guess what it is?\".format(\n self.lower, self.higher\n )\n )\n\n def on_enter_low(self):\n print(\"Too low. Try again.\")\n\n def on_enter_high(self):\n print(\"Too high. Try again.\")\n\n def on_enter_won(self):\n print(\n \"Congratulations, you guessed the number in {} guesses!\".format(\n self.guesses\n )\n )\n\n def on_enter_lose(self):\n print(\"Oh, no! You've spent all your {} attempts!\".format(self.guesses))"
3030
]
3131
},
3232
{
@@ -157,4 +157,4 @@
157157
},
158158
"nbformat": 4,
159159
"nbformat_minor": 0
160-
}
160+
}

docs/auto_examples/guess_the_number_machine.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
Well leave the machine imagine a number and also play the game. Why not?
88
99
"""
10-
1110
import random
12-
from statemachine import StateMachine, State
11+
12+
from statemachine import State
13+
from statemachine import StateMachine
1314

1415

1516
class GuessTheNumberMachine(StateMachine):
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4f09d706ccb016f2ae496d4f3cbbdb8b
1+
410f2a4ba51943452eddefeb5dd03d41

docs/auto_examples/guess_the_number_machine.rst

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ An StateMachine for the well know game.
2525

2626
Well leave the machine imagine a number and also play the game. Why not?
2727

28-
.. GENERATED FROM PYTHON SOURCE LINES 10-82
28+
.. GENERATED FROM PYTHON SOURCE LINES 10-83
2929
3030
.. code-block:: default
3131
32-
3332
import random
34-
from statemachine import StateMachine, State
33+
34+
from statemachine import State
35+
from statemachine import StateMachine
3536
3637
3738
class GuessTheNumberMachine(StateMachine):
@@ -113,13 +114,13 @@ Well leave the machine imagine a number and also play the game. Why not?
113114

114115

115116

116-
.. GENERATED FROM PYTHON SOURCE LINES 83-86
117+
.. GENERATED FROM PYTHON SOURCE LINES 84-87
117118
118119
Playing
119120
-------
120121

121122

122-
.. GENERATED FROM PYTHON SOURCE LINES 86-89
123+
.. GENERATED FROM PYTHON SOURCE LINES 87-90
123124
124125
.. code-block:: default
125126
@@ -140,7 +141,7 @@ Playing
140141
141142
142143
143-
.. GENERATED FROM PYTHON SOURCE LINES 90-93
144+
.. GENERATED FROM PYTHON SOURCE LINES 91-94
144145
145146
.. code-block:: default
146147
@@ -161,7 +162,7 @@ Playing
161162
162163
163164
164-
.. GENERATED FROM PYTHON SOURCE LINES 94-97
165+
.. GENERATED FROM PYTHON SOURCE LINES 95-98
165166
166167
.. code-block:: default
167168
@@ -324,7 +325,7 @@ Playing
324325
<br />
325326
<br />
326327

327-
.. GENERATED FROM PYTHON SOURCE LINES 98-101
328+
.. GENERATED FROM PYTHON SOURCE LINES 99-102
328329
329330
.. code-block:: default
330331
@@ -345,7 +346,7 @@ Playing
345346
346347
347348
348-
.. GENERATED FROM PYTHON SOURCE LINES 102-108
349+
.. GENERATED FROM PYTHON SOURCE LINES 103-109
349350
350351
.. code-block:: default
351352
@@ -518,7 +519,7 @@ Playing
518519
<br />
519520
<br />
520521

521-
.. GENERATED FROM PYTHON SOURCE LINES 111-114
522+
.. GENERATED FROM PYTHON SOURCE LINES 112-115
522523
523524
.. code-block:: default
524525
@@ -539,7 +540,7 @@ Playing
539540
540541
541542
542-
.. GENERATED FROM PYTHON SOURCE LINES 115-118
543+
.. GENERATED FROM PYTHON SOURCE LINES 116-119
543544
544545
.. code-block:: default
545546
@@ -560,7 +561,7 @@ Playing
560561
561562
562563
563-
.. GENERATED FROM PYTHON SOURCE LINES 119-122
564+
.. GENERATED FROM PYTHON SOURCE LINES 120-123
564565
565566
.. code-block:: default
566567
@@ -723,7 +724,7 @@ Playing
723724
<br />
724725
<br />
725726

726-
.. GENERATED FROM PYTHON SOURCE LINES 123-128
727+
.. GENERATED FROM PYTHON SOURCE LINES 124-129
727728
728729
.. code-block:: default
729730

0 commit comments

Comments
 (0)