[travis] osx investigate

See https://wiki.tcl-lang.org/page/Ttk .

.travis.yml

@@ -1,18 +1,42 @@
-os: linux
 dist: trusty
+os:
+    - linux
+    - osx
 before_install:
-    - sudo apt-get update -qq
+    - if test "$TRAVIS_OS_NAME" = "linux" ; then sudo apt-get update -qq ; sudo apt-get install -y ack-grep 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 ; sudo dpkg-divert --local --divert /usr/bin/ack --rename --add /usr/bin/ack-grep ; fi
-    - sudo apt-get install -y ack-grep 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
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then brew update; fi
-    - sudo dpkg-divert --local --divert /usr/bin/ack --rename --add /usr/bin/ack-grep
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then brew list python &>/dev/null || brew install python; fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then brew list python3 &>/dev/null || brew install python3; fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then brew install pyenv-virtualenv; fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then brew bundle ; brew link gettext --force ; export PATH="$PATH:/usr/local/bin" ; export DYLD_LIBRARY_PATH="/usr/local/opt/curl/lib:/usr/local/opt/openssl/lib:${DYLD_LIBRARY_PATH}" ; export PATH="/usr/local/opt/openssl/bin:$PATH" ; export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" ; export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include" ; 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
 install:
     - sudo cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace
     - export PY_MODS='pycotap random2 six'
     - "`which python3` -m pip install --upgrade flake8 $PY_MODS"
-    - "sudo /usr/bin/python3 -m pip install --upgrade $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"
-script: "sh -x scripts/travis-ci-build"
+matrix:
+    exclude:
+        - os: osx
+          python: "3.6"
+    include:
+        - os: osx
+          language: generic
+          env: TOXENV=py35
+script:
+    - "sh -x scripts/travis-ci-build"
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then PYTHONPATH="`pwd`" python3 setup_osx.py py2app ; fi
+    - if test "$TRAVIS_OS_NAME" = "osx" ; then find . -iname '*.app' ; fi
+deploy:
+    provider: releases
+    api_key:
+        secure: SrKnXigL/oUHNbqpbGx0DB1o+LAEkfPA2QTBllXxg4V+1vGAHBT9FRecp8Do+no/zSPRttH+sPDEPBXMMAV0BWVKKw5Mxas/S5ulVkNdfxpTq1bKjI3EjZbVsS1zZlHe0P77TDFDAj8zyeiYecBM08suhd9OvScieiPlpFPE1UYp9vvNKaBgc66IRNnIDRBdktW4YLsgvkrpXnxGPy8gGwylsTeOzNs5/r5dzHswGdksJl46kqCIbV+s4/Xcx+BEnfibWzEFZmLQoGKhoukbSis3YXGIlERcgiVU6v7S2D4wbwUXSAKOj/Io7z/88Co2P3Qbm538kf/pjeR9+DaM1HsHQQcL0detCjjLog+ekKr2fM00QI1yRmqOiZtuXxTMpneYX73EBmPt4la4rjKmnlhS+NTxrynHcPZD8QopCPvoZ3sUD6dQCrbi8kcGxe13srfdJ3KjuWZXdedLIOgNELbj5o6GNivsanWna59yoJzChC5/H5Jjllncvzbp56TZfEkM1NJkE84jjSS8Sn2KLXjD0woHIsuUSkRNExrCt/6QmIub/QxZPUhwQ2J0xCv1IJPdd0XvO3gCqasG3UA2Q0OlP172x92ocOV/wm1/4wfoG6v/mn+bX5ZwvrsMmm+r3FKKlM8L3T33yFjMzgG/YMoRN8w7pXUIkdtZK8EEDVg=
+    file: dist/pysol.app
+    on:
+        repo: shlomif/PySolFC
+        tags: true

Brewfile

@@ -0,0 +1,5 @@
+brew "cpanminus"
+brew "gettext"
+brew "gnutls"
+brew "openssl"
+brew "tcl-tk"

contrib/install-pysolfc.sh

@@ -1,14 +1,15 @@
 #! /bin/sh -Cefu
 
 : ${PKGTREE:=/usr/local/packages/PySolFC}
-PIP=$(printf '%s/env/bin/pip install --no-binary :all: ' $PKGTREE)
+PIP="$(printf '%s/env/bin/pip install --no-binary :all: ' "$PKGTREE")"
-PYPROG=$(printf '%s/env/bin/python' $PKGTREE)
+PYPROG="$(printf '%s/env/bin/python' "$PKGTREE")"
-VERSION=$(env PYTHONPATH=`pwd` $PYPROG -c 'from pysollib.settings import VERSION ; print(VERSION)' )
+VERSION="$(env PYTHONPATH=`pwd` "$PYPROG" -c 'from pysollib.settings import VERSION ; print(VERSION)')"
-XZBALL=$(printf 'dist/PySolFC-%s.tar.xz' $VERSION)
+XZBALL="$(printf 'dist/PySolFC-%s.tar.xz' "$VERSION")"
-REQS='six random2 pillow'
+reqs='six random2 pillow'
 
 make dist
-for req in $REQS ; do
+for req in $reqs
-    $PIP $req
+do
+    "$PIP" "$req"
 done
-$PIP --upgrade $XZBALL
+"$PIP" --upgrade "$XZBALL"

pysollib/game.py

@@ -3098,7 +3098,7 @@ Congratulations, you did it !
         try:
             game = self._loadGame(filename, self.app)
             game.gstats.holded = 0
-        except AssertionError as ex:
+        except AssertionError:
             self.updateMenus()
             self.setCursor(cursor=self.app.top_cursor)
             MfxMessageDialog(

pysollib/games/mahjongg/mahjongg.py

@@ -1023,7 +1023,7 @@ def r(id, short_name, name=None, ncards=144, layout=None):
     assert layout
     if not name:
         name = "Mahjongg " + short_name
-    classname = re.sub('\W', '', name)
+    classname = re.sub('\\W', '', name)
     # create class
     gameclass = type(classname, (AbstractMahjonggGame,), {})
     gameclass.L = layout

pysollib/hint.py

@@ -800,7 +800,7 @@ class Base_Solver_Hint:
         return [hint]
 
     def colonPrefixMatch(self, prefix, s):
-        m = re.match(prefix + ': (\d+)', s)
+        m = re.match(prefix + ': ([0-9]+)', s)
         if m:
             self._v = int(m.group(1))
             return True
@@ -1084,12 +1084,12 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
                 print(s)
             if self._determineIfSolverState(s):
                 next
-            m = re.match('Total number of states checked is (\d+)\.', s)
+            m = re.match('Total number of states checked is ([0-9]+)\\.', s)
             if m:
                 iter_ = int(m.group(1))
                 self.dialog.setText(iter=iter_)
 
-            m = re.match('This scan generated (\d+) states\.', s)
+            m = re.match('This scan generated ([0-9]+) states\\.', s)
 
             if m:
                 states = int(m.group(1))
@@ -1102,7 +1102,7 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
             move_s = m.group(1)
 
             m = re.match(
-                'the sequence on top of Stack (\d+) to the foundations',
+                'the sequence on top of Stack ([0-9]+) to the foundations',
                 move_s)
 
             if m:
@@ -1113,11 +1113,11 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
                 dest = None
             else:
                 m = re.match(
-                    '(?P<ncards>a card|(?P<count>\d+) cards) '
+                    '(?P<ncards>a card|(?P<count>[0-9]+) cards) '
                     'from (?P<source_type>stack|freecell) '
-                    '(?P<source_idx>\d+) to '
+                    '(?P<source_idx>[0-9]+) to '
                     '(?P<dest>the foundations|(?P<dest_type>freecell|stack) '
-                    '(?P<dest_idx>\d+))\s*', move_s)
+                    '(?P<dest_idx>[0-9]+))\\s*', move_s)
 
                 if not m:
                     continue
@@ -1230,13 +1230,13 @@ class BlackHoleSolver_Hint(Base_Solver_Hint):
             s = six.text_type(sbytes, encoding='utf-8')
             if DEBUG:
                 print(s)
-            m = re.match('Total number of states checked is (\d+)\.', s)
+            m = re.match('Total number of states checked is ([0-9]+)\\.', s)
             if m:
                 iter_ = int(m.group(1))
                 self.dialog.setText(iter=iter_)
                 continue
 
-            m = re.match('This scan generated (\d+) states\.', s)
+            m = re.match('This scan generated ([0-9]+) states\\.', s)
 
             if m:
                 states = int(m.group(1))

pysollib/tk/tkstats.py

@@ -170,7 +170,6 @@ class SingleGame_StatsDialog(MfxDialog):
                 x, ty[1]-dy, text="%d%%" % (100-pw), anchor="ne", font=tfont,
                 fill=fg)
 
-
 #      def _createChart3DBar(self, canvas, perc, x, y, p, col):
 #          if perc < 0.005:
 #              return
@@ -204,11 +203,6 @@ class SingleGame_StatsDialog(MfxDialog):
 #          draw_line(5, 6)
 #          draw_line(6, 7)
 #          draw_line(7, 4)
-
-    #
-    # charts
-    #
-
 #      def createSimpleChart(self, app, won, lost, text):
 #          #c, tfont, fg = self._createChartInit(frame, 300, 100, text)
 #          self._createChartInit(300, 100, text)
@@ -217,7 +211,6 @@ class SingleGame_StatsDialog(MfxDialog):
 #          tx = (90, 180, 210)
 #          ty = (21, 41, 75)
 #          self._createChartTexts(tx, ty, won, lost)
-
 #      def create3DBarChart(self, app, won, lost, text):
 #          image = app.gimages.stats[0]
 #          iw, ih = image.width(), image.height()

scripts/gen_individual_importing_tests.py

@@ -2,6 +2,9 @@
 # Written by Shlomi Fish, under the MIT Expat License.
 
 import os.path
+from sys import platform
+
+IS_MAC = (platform == "darwin")
 for module_name in \
         [
          'pysollib.acard',
@@ -200,8 +203,9 @@ for module_name in \
          'pysollib.wizardpresets',
          'pysollib.wizardutil',
         ]:
+    is_gtk = ("gtk" in module_name)
     for ver in [2, 3]:
-        if ver == 2 or "gtk" not in module_name:
+        if ((not is_gtk) or (ver == 2 and (not IS_MAC))):
             def fmt(s):
                 return s % {'module_name': module_name, 'ver': ver}
             open(os.path.join(".", "tests", "individually-importing", fmt("import_v%(ver)d_%(module_name)s.py")), 'w').write(fmt('''#!/usr/bin/env python%(ver)d

setup_osx.py

@@ -6,7 +6,6 @@ Usage:
 import os
 import sys
 import shutil
-from six.moves import tkinter
 from subprocess import call
 from setuptools import setup
 from pysollib.settings import PACKAGE, VERSION
@@ -26,21 +25,6 @@ if not os.path.exists('data/html'):
 # build the HTML list of games
 call("./scripts/all_games.py > docs/all_games.html", shell=True)
 
-# Use Tile widgets, if they are installed.
-# http://tktable.sourceforge.net/tile/
-root = tkinter.Tk()
-root.withdraw()
-try:
-    root.tk.call('package', 'require', 'tile', '0.7.8')
-except Exception:
-    TILE = None
-else:
-    TILE = "tile0.7.8"
-    TCL_EXTENSION_PATH = "/Library/Tcl"
-finally:
-    root.destroy()
-    del root, tkinter
-
 # Use Freecell Solver, if it is installed.
 # http://fc-solve.berlios.de/
 SOLVER_LIB_PATH = "/usr/local/lib/libfreecell-solver.0.dylib"
@@ -66,7 +50,7 @@ PLIST = dict(
 APP = ['pysol.py']
 ICON_FILE = 'data/PySol.icns'
 DATA_FILES = ['docs', 'data', 'scripts', 'COPYING', 'README.md'] + SOLVER
-RESOURCES = [os.path.join(TCL_EXTENSION_PATH, TILE)] if TILE else []
+RESOURCES = []
 FRAMEWORKS = [SOLVER_LIB_PATH] if SOLVER_LIB_PATH else []
 OPTIONS = dict(argv_emulation=True,
                plist=PLIST,
@@ -85,15 +69,6 @@ setup(
 
 #
 top = os.getcwd()
-# FIXME: a hack to get Tcl extensions working
-# from inside the app bundle
-if TILE and "py2app" in sys.argv:
-    os.chdir('dist/%s.app/Contents/Frameworks' % PACKAGE)
-    try:
-        os.symlink('../Resources/%s' % TILE, TILE)
-    except OSError:
-        pass
-    os.chdir(top)
 # Modify the fc-solve binary with install_name_tool to use the dependent
 # libfreecell-solver dynamic library in the app bundle.
 if SOLVER and "py2app" in sys.argv: