mirror of
https://github.com/shlomif/PySolFC.git
synced 2025-04-05 00:02:29 -04:00
flake8 .
This commit is contained in:
Shlomi Fish
parent
845c72363a
commit
0414047586
3 changed files with 72 additions and 63 deletions
9
Makefile
9
Makefile
|
|
@ -66,10 +66,15 @@ pretest:
|
|||
@rm -f tests/individually-importing/*.py # To avoid stray files
|
||||
python scripts/gen_individual_importing_tests.py
|
||||
|
||||
TEST_ENV = PYTHONPATH="`pwd`:`pwd`/tests/lib"
|
||||
TEST_FILES = tests/style/*.t tests/board_gen/*.py tests/individually-importing/*.py
|
||||
|
||||
define RUN_TESTS
|
||||
$(TEST_ENV) $1 $(TEST_FILES)
|
||||
endef
|
||||
|
||||
test: pretest
|
||||
prove $(TEST_FILES)
|
||||
$(call RUN_TESTS,prove)
|
||||
|
||||
runtest: pretest
|
||||
runprove $(TEST_FILES)
|
||||
$(call RUN_TESTS,runprove)
|
||||
|
|
|
|||
|
|
@ -53,15 +53,12 @@
|
|||
|
||||
|
||||
# imports
|
||||
import sys, os, re, string, time, types
|
||||
|
||||
sys.path.append("./tests/lib")
|
||||
import sys
|
||||
from TAP.Simple import plan, ok
|
||||
|
||||
# So the localpaths will be overrided.
|
||||
sys.path.insert(0, ".")
|
||||
|
||||
from pysollib.pysolrandom import constructRandom, LCRandom31, random__str2long, random__long2str
|
||||
from pysollib.pysolrandom import constructRandom, LCRandom31, \
|
||||
random__str2long, random__long2str
|
||||
|
||||
# PySol imports
|
||||
|
||||
|
|
@ -71,6 +68,7 @@ from pysollib.pysolrandom import constructRandom, LCRandom31, random__str2long,
|
|||
# // We use a seed of type long in the range [0, MAX_SEED].
|
||||
# ************************************************************************/
|
||||
|
||||
|
||||
class Card:
|
||||
|
||||
ACE = 1
|
||||
|
|
@ -97,7 +95,7 @@ class Card:
|
|||
return s
|
||||
|
||||
def suit_s(self):
|
||||
return "CSHD"[self.suit];
|
||||
return "CSHD"[self.suit]
|
||||
|
||||
def to_s(self):
|
||||
if self.empty:
|
||||
|
|
@ -121,6 +119,7 @@ class Card:
|
|||
def is_empty(self):
|
||||
return self.empty
|
||||
|
||||
|
||||
class Columns:
|
||||
|
||||
def __init__(self, num):
|
||||
|
|
@ -143,6 +142,7 @@ class Columns:
|
|||
s += column_to_string(column) + "\n"
|
||||
return s
|
||||
|
||||
|
||||
class Board:
|
||||
def __init__(self, num_columns, with_freecells=False,
|
||||
with_talon=False, with_foundations=False):
|
||||
|
|
@ -218,6 +218,7 @@ def empty_card():
|
|||
ret.empty = True
|
||||
return ret
|
||||
|
||||
|
||||
def createCards(num_decks, print_ts):
|
||||
cards = []
|
||||
for deck in range(num_decks):
|
||||
|
|
@ -228,12 +229,15 @@ def createCards(num_decks, print_ts):
|
|||
id = id + 1
|
||||
return cards
|
||||
|
||||
|
||||
def column_to_list_of_strings(col):
|
||||
return map(lambda c: c.to_s(), col)
|
||||
|
||||
|
||||
def column_to_string(col):
|
||||
return " ".join(column_to_list_of_strings(col))
|
||||
|
||||
|
||||
def flip_card(card_str, flip):
|
||||
if flip:
|
||||
return "<" + card_str + ">"
|
||||
|
|
@ -254,23 +258,28 @@ def shuffle(orig_cards, rand):
|
|||
rand.shuffle(shuffled_cards)
|
||||
return shuffled_cards
|
||||
|
||||
|
||||
class Game:
|
||||
REVERSE_MAP = \
|
||||
{
|
||||
"freecell":
|
||||
["freecell", "forecell", "bakers_game",
|
||||
"ko_bakers_game", "kings_only_bakers_game", "relaxed_freecell",
|
||||
"eight_off" ],
|
||||
"ko_bakers_game", "kings_only_bakers_game",
|
||||
"relaxed_freecell", "eight_off"],
|
||||
"der_katz":
|
||||
["der_katz", "der_katzenschwantz", "die_schlange"],
|
||||
"seahaven":
|
||||
[ "seahaven_towers", "seahaven", "relaxed_seahaven", "relaxed_seahaven_towers" ],
|
||||
["seahaven_towers", "seahaven", "relaxed_seahaven",
|
||||
"relaxed_seahaven_towers"],
|
||||
"bakers_dozen": None,
|
||||
"gypsy": None,
|
||||
"klondike" : [ "klondike", "klondike_by_threes", "casino_klondike", "small_harp", "thumb_and_pouch", "vegas_klondike", "whitehead" ],
|
||||
"klondike": ["klondike", "klondike_by_threes",
|
||||
"casino_klondike", "small_harp",
|
||||
"thumb_and_pouch", "vegas_klondike", "whitehead"],
|
||||
"simple_simon": None,
|
||||
"yukon": None,
|
||||
"beleaguered_castle" : [ "beleaguered_castle", "streets_and_alleys", "citadel" ],
|
||||
"beleaguered_castle": ["beleaguered_castle",
|
||||
"streets_and_alleys", "citadel"],
|
||||
"fan": None,
|
||||
"black_hole": None,
|
||||
"all_in_a_row": None,
|
||||
|
|
@ -302,10 +311,11 @@ class Game:
|
|||
return self.board.output()
|
||||
|
||||
def lookup(self):
|
||||
return self.games_map[self.game_id];
|
||||
return self.games_map[self.game_id]
|
||||
|
||||
def is_two_decks(self):
|
||||
return self.game_id in ("der_katz", "der_katzenschwantz", "die_schlange", "gypsy")
|
||||
return self.game_id in ("der_katz", "der_katzenschwantz",
|
||||
"die_schlange", "gypsy")
|
||||
|
||||
def get_num_decks(self):
|
||||
if self.is_two_decks():
|
||||
|
|
@ -357,8 +367,8 @@ class Game:
|
|||
for card in game:
|
||||
game.board.add_talon(card)
|
||||
|
||||
### These are the games variants:
|
||||
### Each one is a callback.
|
||||
# These are the games variants:
|
||||
# Each one is a callback.
|
||||
def der_katz(game):
|
||||
if (game.game_id == "die_schlange"):
|
||||
return "Foundations: H-A S-A D-A C-A H-A S-A D-A C-A"
|
||||
|
|
@ -495,7 +505,8 @@ class Game:
|
|||
game.board = Board(17)
|
||||
|
||||
# move Ace to bottom of the Talon (i.e. last cards to be dealt)
|
||||
game.cards = game._shuffleHookMoveToBottom(game.cards, lambda c: (c.id == 13, c.suit), 1)
|
||||
game.cards = game._shuffleHookMoveToBottom(
|
||||
game.cards, lambda c: (c.id == 13, c.suit), 1)
|
||||
game.next()
|
||||
game.cyclical_deal(52-1, 17)
|
||||
|
||||
|
|
@ -505,7 +516,8 @@ class Game:
|
|||
game.board = Board(13)
|
||||
|
||||
# move Ace to bottom of the Talon (i.e. last cards to be dealt)
|
||||
game.cards = game._shuffleHookMoveToTop(game.cards, lambda c: (c.id == 13, c.suit), 1)
|
||||
game.cards = game._shuffleHookMoveToTop(
|
||||
game.cards, lambda c: (c.id == 13, c.suit), 1)
|
||||
game.cyclical_deal(52, 13)
|
||||
return "Foundations: -"
|
||||
|
||||
|
|
@ -525,11 +537,11 @@ class Game:
|
|||
|
||||
game.new_cards(new_cards)
|
||||
|
||||
|
||||
for i in range(6):
|
||||
for s in range(8):
|
||||
c = game.next()
|
||||
if (game.game_id == "citadel") and game.board.put_into_founds(c):
|
||||
if (game.game_id == "citadel") and \
|
||||
game.board.put_into_founds(c):
|
||||
# Already dealt with this card
|
||||
True
|
||||
else:
|
||||
|
|
@ -554,6 +566,7 @@ class Game:
|
|||
|
||||
game.cyclical_deal(num_cols, num_cols)
|
||||
|
||||
|
||||
def shlomif_main(args):
|
||||
|
||||
plan(8)
|
||||
|
|
@ -570,9 +583,7 @@ QC 9S 6H 9H 3S KS 3D
|
|||
7H JS KH TS KC 7C
|
||||
AH 5S 6S AD 8H JD
|
||||
7S 6C 7D 4D 8S 9D
|
||||
''',
|
||||
'Deal 24',
|
||||
);
|
||||
''', 'Deal 24')
|
||||
|
||||
rand = constructRandom('ms123456')
|
||||
game = Game("freecell", rand, True)
|
||||
|
|
@ -586,9 +597,7 @@ JS 8S 4D 4C 2S 7D 3C
|
|||
5D 3S 3D 3H KD JH
|
||||
6C QS 4S 2D KS TS
|
||||
JD QH 6S 4H QC 8H
|
||||
''',
|
||||
'Microsoft Deal 123456',
|
||||
);
|
||||
''', 'Microsoft Deal 123456')
|
||||
|
||||
rand = constructRandom('123456')
|
||||
game = Game("freecell", rand, True)
|
||||
|
|
@ -602,9 +611,7 @@ AC 9D 7H 6D KS JH
|
|||
6H TH 8H QS 7D JC
|
||||
4C 2S 3S 6S 5H 3H
|
||||
KC JS 9H 4S 7S AD
|
||||
''',
|
||||
'PySolFC deal No. 123456',
|
||||
);
|
||||
''', 'PySolFC deal No. 123456')
|
||||
|
||||
rand = constructRandom('ms3000000000')
|
||||
game = Game("freecell", rand, True)
|
||||
|
|
@ -618,9 +625,7 @@ KC JS 9H 4S 7S AD
|
|||
9C 7C QC 7S QD 7D
|
||||
6C 3H 8H AC 6D 3S
|
||||
8C AH 2H 5H 2D 5S
|
||||
''',
|
||||
'Microsoft Deal #3E9 - long seed.',
|
||||
);
|
||||
''', 'Microsoft Deal #3E9 - long seed.')
|
||||
|
||||
rand = constructRandom('ms6000000000')
|
||||
game = Game("freecell", rand, True)
|
||||
|
|
@ -634,9 +639,7 @@ TD 7C 9C 7H 3C 3S
|
|||
QH 9H 9D 5S 7S 6C
|
||||
5C 5H 2S KC 9S 4S
|
||||
6D QC 8S TH 7D 8H
|
||||
''',
|
||||
'Microsoft Deal #6E9 - extra long seed.',
|
||||
);
|
||||
''', 'Microsoft Deal #6E9 - extra long seed.')
|
||||
|
||||
inp = 'ms12345678'
|
||||
got = random__long2str(random__str2long(inp))
|
||||
|
|
@ -657,5 +660,6 @@ QH 9H 9D 5S 7S 6C
|
|||
# TEST
|
||||
ok(got == inp, 'str2long PySolFC roundtrip.')
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(shlomif_main(sys.argv))
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ my %skip =
|
|||
|
||||
# my $cmd = shell_quote( 'flake8', '.' );
|
||||
my $cmd = shell_quote( 'flake8',
|
||||
grep { not exists $skip{$_} } glob('*.py ./pysollib/*.py ./pysollib/[cmgpuw]*/{*/*.py,*.py} ./pysollib/tile/*.py ./pysollib/ui/tktile/*.py') );
|
||||
grep { not exists $skip{$_} } glob('*.py ./tests/board_gen/*.py ./pysollib/*.py ./pysollib/[cmgpuw]*/{*/*.py,*.py} ./pysollib/tile/*.py ./pysollib/ui/tktile/*.py') );
|
||||
|
||||
# TEST
|
||||
eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue