travis: Simplify pip install step

Travis's python virtualenv setup does not help too much in our case
because we use both python2 and python3 while travis will setup the
virtualenv for only one at a time.

.travis.yml

@@ -1,20 +1,4 @@
 addons:
-    apt:
-        packages:
-            - cpanminus
-            - libperl-dev
-            - make
-            - perl
-            - python-glade2
-            - python-gnome2
-            - python-gnome2-dev
-            - python-gtk2
-            - python-setuptools
-            - python-tk
-            - python3
-            - python3-pip
-            - python3-setuptools
-            - python3-tk
     homebrew:
         update: true
         brewfile: true
@@ -32,32 +16,34 @@ deploy:
         repo: shlomif/PySolFC
         tags: true
     skip_cleanup: true
-dist: trusty
+dist: bionic
 before_install:
-    - if test "$TRAVIS_OS_NAME" = "osx" ; then export CPPFLAGS="$CPPFLAGS -I$(brew --prefix openssl)/include" PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig:$PKG_CONFIG_PATH" LDFLAGS="$LDFLAGS -L$(brew --prefix openssl)/lib" ;fi
     - if test "$TRAVIS_OS_NAME" = "osx" ; then wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.tar.xz/download && tar xJf PySolFC-Cardsets--Minimal-2.0.tar.xz && mv PySolFC-Cardsets--Minimal-2.0/cardset-* data ; fi
 install:
-    - sudo cpanm --notest Capture::Tiny
+    # Tests are failing for them sometimes
+    - sudo cpanm --notest Capture::Tiny IPC::System::Simple
     - sudo cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace
     - export PY_MODS='attrs configobj pycotap pysol-cards random2 setuptools six'
-    - "`which python3` -m pip install --upgrade flake8 flake8-import-order $PY_MODS"
-    - "sudo /usr/bin/python3 -m pip install --upgrade $PY_MODS || true"
-    - "sudo `which python2` -m pip install --upgrade $PY_MODS"
-    - which python
-    - which python2
-language: python
-python: "3.6"
+    - sudo pip3 install --upgrade $PY_MODS flake8 flake8-import-order
+    - sudo pip2 install --upgrade $PY_MODS
+language: generic
 matrix:
     include:
         - os: linux
+          before_install:
+            - sudo apt-get install -y
+                cpanminus
+                python-glade2
+                python-gnome2
+                python-gnome2-dev
+                python-gtk2
+                python-pip
+                python-setuptools
+                python-tk
+                python3-pip
+                python3-setuptools
+                python3-tk
         - os: osx
-          language: generic
-          env:
-            - TOXENV=py35
-            - PATH="/usr/local/opt/openssl/bin:$PATH:/usr/local/bin"
-            - DYLD_LIBRARY_PATH="/usr/local/opt/curl/lib:/usr/local/opt/openssl/lib:${DYLD_LIBRARY_PATH}"
-            - LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib"
-            - CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include"
 script:
     - export TIDYALL_DATA_DIR="$HOME/tidyall_d"
     - bash -x scripts/travis-ci-build

docs/pysolfc.6

@@ -69,9 +69,9 @@ the current directory
 .br
 /usr/local/share/PySolFC
 .br
-/usr/games/PySolFC
+/usr/share/games/PySolFC
 .br
-/usr/local/games/PySolFC
+/usr/local/share/games/PySolFC
 .PP
 Options are saved in \fB~/.PySolFC/options.cfg\fR
 .PP

pysollib/app.py

@@ -1211,11 +1211,10 @@ Please select a %s type %s.
                     d = os.path.join(dirname, name)
                     if not os.path.isdir(d):
                         continue
-                    f1 = os.path.join(d, "config.txt")
-                    f2 = os.path.join(d, "COPYRIGHT")
-                    if os.path.isfile(f1) and os.path.isfile(f2):
+                    f = os.path.join(d, "config.txt")
+                    if os.path.isfile(f):
                         try:
-                            cs = self._readCardsetConfig(d, f1)
+                            cs = self._readCardsetConfig(d, f)
                             if cs:
                                 # from pprint import pprint
                                 # print cs.name
@@ -1232,7 +1231,7 @@ Please select a %s type %s.
                                     fnames[cs.name] = 1
                             else:
                                 print_err('fail _readCardsetConfig: %s %s'
-                                          % (d, f1))
+                                          % (d, f))
                                 pass
                         except Exception:
                             # traceback.print_exc()

pysollib/game/__init__.py

@@ -347,6 +347,17 @@ class GameDrag(NewStruct):
     cards = attr.ib(factory=list)
     canshade_stacks = attr.ib(factory=list)
     noshade_stacks = attr.ib(factory=list)
+    shadows = attr.ib(factory=list)
+
+
+@attr.s
+class GameTexts(NewStruct):
+    info = attr.ib(default=None)
+    help = attr.ib(default=None)
+    misc = attr.ib(default=None)
+    score = attr.ib(default=None)
+    base_rank = attr.ib(default=None)
+    list = attr.ib(factory=list)
 
 
 class Game(object):
@@ -554,14 +565,7 @@ class Game(object):
         if self.gstats.start_player is None:
             self.gstats.start_player = self.app.opt.player
         # optional MfxCanvasText items
-        self.texts = Struct(
-            info=None,                # misc info text
-            help=None,                # a static help text
-            misc=None,                #
-            score=None,               # for displaying the score
-            base_rank=None,           # for displaying the base_rank
-            list=[],                  # list of texts (if we use many text)
-        )
+        self.texts = GameTexts()
         # initial position of the texts
         self.init_texts = Struct(
             info=None,                # misc info text

pysollib/games/ultra/hanafuda_common.py

@@ -286,6 +286,9 @@ class Hanafuda_SequenceStack(Flower_OpenStack):
             return cards[0].rank == 0 or self.cap.base_rank == ANY_RANK
         return self.isHanafudaSequence([stackcards[-1], cards[0]])
 
+    def canMoveCards(self, cards):
+        return self.basicCanMoveCards(cards) and self.isHanafudaSequence(cards)
+
 
 class Oonsoo_SequenceStack(Flower_OpenStack):
 
@@ -298,6 +301,10 @@ class Oonsoo_SequenceStack(Flower_OpenStack):
             return cards[0].rank == 0 or self.cap.base_rank == ANY_RANK
         return self.isHanafudaSequence([stackcards[-1], cards[0]], 0)
 
+    def canMoveCards(self, cards):
+        return (self.basicCanMoveCards(cards) and
+                self.isHanafudaSequence(cards, 0))
+
 
 class FlowerClock_RowStack(Flower_OpenStack):
 

pysollib/pysolrandom.py

@@ -26,6 +26,8 @@
 import re
 import time
 
+import pysol_cards
+
 from pysollib.mfxutil import SubclassResponsibility
 try:
     import random2
@@ -34,6 +36,8 @@ except ImportError:
         "You need to install " +
         "https://pypi.python.org/pypi/random2 using pip or similar.")
 
+assert ((pysol_cards.VERSION if 'VERSION' in pysol_cards.__dict__
+         else (0, 0, 0)) >= (0, 8, 2))
 from pysol_cards.random_base import RandomBase  # noqa: I100
 from pysol_cards.random import match_ms_deal_prefix  # noqa: I100
 
@@ -56,15 +60,6 @@ class BasicRandom(RandomBase):
     ORIGIN_SELECTED = 3         # manually entered
     ORIGIN_NEXT_GAME = 4        # "Next game number"
 
-    def getSeedStr(self):
-        return str(self.initial_seed)
-
-    def __str__(self):
-        return self.str(self.initial_seed)
-
-    def str(self, seed):
-        return '%020d' % seed
-
     def reset(self):
         raise SubclassResponsibility
 

pysollib/settings.py

@@ -63,8 +63,8 @@ if os.name == 'posix':
     DATA_DIRS = [
         '/usr/share/PySolFC',
         '/usr/local/share/PySolFC',
-        '/usr/games/PySolFC',
-        '/usr/local/games/PySolFC',
+        '/usr/share/games/PySolFC',
+        '/usr/local/share/games/PySolFC',
         ]
 if os.name == 'nt':
     pass

pysollib/tile/selectgame.py

@@ -21,7 +21,6 @@
 #
 # ---------------------------------------------------------------------------
 
-
 import os
 
 from pysollib.gamedb import GI
@@ -80,7 +79,8 @@ class SelectGameData(SelectDialogTreeData):
     def __init__(self, app):
         SelectDialogTreeData.__init__(self)
         self.all_games_gi = list(map(
-            app.gdb.get, app.gdb.getGamesIdSortedByName()))
+            app.gdb.get,
+            app.gdb.getGamesIdSortedByName()))
         self.no_games = [SelectGameLeaf(None, None, _("(no games)"), None), ]
         #
         s_by_type = s_oriental = s_special = s_original = s_contrib = \
@@ -321,7 +321,7 @@ class SelectGameDialog(MfxDialog):
         if button == 0:                 # Ok or double click
             self.gameid = self.tree.selection_key
             self.tree.n_expansions = 1  # save xyview in any case
-        if button == 10:                # Rules
+        if button == 1:                # Rules
             doc = self.app.getGameRulesFilename(self.tree.selection_key)
             if not doc:
                 return

pysollib/tk/selectgame.py

@@ -24,7 +24,6 @@
 import os
 
 from pysollib.gamedb import GI
-from pysollib.help import help_html
 from pysollib.mfxutil import KwStruct, Struct, destruct
 from pysollib.mfxutil import format_time
 from pysollib.mygettext import _
@@ -39,11 +38,11 @@ from .selecttree import SelectDialogTreeCanvas
 from .selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
 from .tkwidget import MfxDialog, MfxScrolledCanvas
 
-
 # ************************************************************************
 # * Nodes
 # ************************************************************************
 
+
 class SelectGameLeaf(SelectDialogTreeLeaf):
     pass
 
@@ -137,7 +136,6 @@ class SelectGameData(SelectDialogTreeData):
         if 1 and gg:
             s_by_compatibility = SelectGameNode(None, _("by Compatibility"),
                                                 tuple(gg))
-            pass
         #
         s_by_pysol_version, gg = None, []
         for name, games in GI.GAMES_BY_PYSOL_VERSION:
@@ -308,8 +306,8 @@ class SelectGameDialog(MfxDialog):
     def initKw(self, kw):
         kw = KwStruct(kw,
                       strings=(None, None, _("&Cancel"),), default=0,
-                      separator=True,
                       resizable=True,
+                      separator=True,
                       padx=10, pady=10,
                       buttonpadx=10, buttonpady=5,
                       )
@@ -322,14 +320,15 @@ class SelectGameDialog(MfxDialog):
         MfxDialog.destroy(self)
 
     def mDone(self, button):
-        if button == 0:                    # Ok or double click
+        if button == 0:                 # Ok or double click
             self.gameid = self.tree.selection_key
             self.tree.n_expansions = 1  # save xyview in any case
-        if button == 1:                    # Rules
+        if button == 1:                # Rules
             doc = self.app.getGameRulesFilename(self.tree.selection_key)
             if not doc:
                 return
             dir = os.path.join("html", "rules")
+            from pysollib.help import help_html
             help_html(self.app, doc, dir, self.top)
             return
         MfxDialog.mDone(self, button)

scripts/gen_individual_importing_tests.py

@@ -37,6 +37,7 @@ print('ok 1 - imported')
 for ver in PY_VERS:
     for mod in [
             'pysol_tests.acard_unit',
+            'pysol_tests.game_drag',
             'pysol_tests.hint',
             'pysol_tests.import_file1',
             'pysol_tests.latin1_conv_unit',

scripts/repack-min-cardsets.bash

@@ -10,9 +10,9 @@ set -e -x
 
 src_base="PySolFC-Cardsets"
 dest_base="$src_base--Minimal"
-ver="2.0"
+ver="2.0.1"
 src_vbase="$src_base-2.0"
-dest_vbase="$dest_base-2.0"
+dest_vbase="$dest_base-2.0.1"
 src_arc="$src_vbase.tar.bz2"
 
 if ! test -f "$src_arc"
@@ -21,6 +21,7 @@ then
 fi
 
 tar -xvf "$src_arc"
+rm -rf "$dest_vbase"
 mkdir -p "$dest_vbase"
 cat scripts/cardsets_to_bundle | (while read b
 do

setup.py

@@ -91,6 +91,7 @@ kw = {
                  'pysollib.ui',
                  'pysollib.ui.tktile',
                  'pysollib.kivy',
+                 'pysollib.game',
                  'pysollib.games',
                  'pysollib.games.special',
                  'pysollib.games.ultra',

tests/lib/pysol_tests/game_drag.py

@@ -0,0 +1,12 @@
+# Written by Shlomi Fish, under the MIT Expat License.
+
+import unittest
+
+from pysollib.game import GameDrag
+
+
+class MyTests(unittest.TestCase):
+    def test_shadows(self):
+        d = GameDrag()
+        d.shadows.append("test")
+        self.assertTrue(len(d.shadows))