setup multibuild for compiling multi-platform wheels

.appveyor.yml

@@ -1,21 +1,93 @@
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
+
 environment:
+  global:
+    TWINE_USERNAME: "adobe-type-tools-ci"
+    # TWINE_PASSWORD is set in Appveyor settings
+
   matrix:
-    - TOXENV: py27-cov
-    - TOXENV: py36-cov
+    - PYTHON: "C:\\Python27"
+      PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "32"
+      TOXENV: "py27-cov"
+      TOXPYTHON: "C:\\Python27\\python.exe"
+
+    # - PYTHON: "C:\\Python36"
+    #   PYTHON_VERSION: "3.6"
+    #   PYTHON_ARCH: "32"
+    #   TOXENV: "py36-cov"
+    #   TOXPYTHON: "C:\\Python36\\python.exe"
+
+    # - PYTHON: "C:\\Python27-x64"
+    #   PYTHON_VERSION: "2.7"
+    #   PYTHON_ARCH: "64"
+    #   TOXENV: "py27-cov"
+    #   TOXPYTHON: "C:\\Python27-x64\\python.exe"
+
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6"
+      PYTHON_ARCH: "64"
+      TOXENV: "py36-cov"
+      TOXPYTHON: "C:\\Python36-x64\\python.exe"
+
+matrix:
+  fast_finish: true
+
+skip_branch_with_pr: true
+
+init:
+  - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 
 install:
-  - git submodule update --init
-  - python -m pip install --upgrade pip
-  - pip install -r requirements.txt
-  - pip install -r dev-requirements.txt
+  # checkout git sub-modules
+  - git submodule update --init --recursive
+
+  # prepend newly installed Python to the PATH
+  - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
+
+  # check that we have the expected version and architecture for Python
+  - python --version
+  - python -c "import struct; print(struct.calcsize('P') * 8)"
+
+  # upgrade pip to avoid out-of-date warnings
+  - python -m pip install --disable-pip-version-check --upgrade pip
+  - python -m pip --version
+
+  # install tox
+  - python -m pip install -r dev-requirements.txt
+
+  # build psautohint wheel
+  - tox -e wheel
+  - for /f "usebackq tokens=*" %w in (`dir /b dist\psautohint*.whl`) do set WHEEL_PATH=%cd%\dist\%w
 
 build: false
 
 test_script:
-  - tox
+  # run tests on the compiled wheel
+  - tox --installpkg "%WHEEL_PATH%"
 
 on_success:
+  # upload test coverage to codecov.io
   - tox -e codecov
+  # if commit is tagged, upload wheel to PyPI
+  - ps: >-
+      if($env:APPVEYOR_REPO_TAG -eq 'true') {
+        Write-Output ("Deploying " + $env:APPVEYOR_REPO_TAG_NAME + " to PyPI...")
+        pip install --upgrade twine
+        twine upload $env:WHEEL_PATH
+      } else {
+        Write-Output "Not deploying as this is not a tagged commit"
+      }
 
-skip_branch_with_pr: true
+on_failure:
+  # print the content of tox *.log files
+  - ps: Get-Content .tox\\log\\*.log
+  - ps: $envlogdir = ".tox\\" + ${env:TOXENV} + "\\log"; `
+        foreach($logfile in Get-ChildItem $envlogdir){ `
+            $logpath = $envlogdir + "\\" + $logfile; `
+            Get-Content -path $logpath }
 
+artifacts:
+  # archive the generated packages in the ci.appveyor.com build report
+  - path: dist\*.whl

.coveragerc

@@ -2,14 +2,17 @@
 # measure 'branch' coverage in addition to 'statement' coverage
 # See: http://coverage.readthedocs.io/en/coverage-4.5.1/branch.html
 branch = True
-parallel = True
 
 # list of directories or packages to measure
+source = psautohint
+
+# these are treated as equivalent when combining data
+[paths]
 source =
     python/psautohint
-
-omit =
-    */__init__.py
+    .tox/*/lib/python*/site-packages/psautohint
+    .tox/*/Lib/site-packages/psautohint
+    .tox/pypy*/site-packages/psautohint
 
 [report]
 # Regexes for lines to exclude from consideration
@@ -18,11 +21,16 @@ exclude_lines =
     pragma: no cover
 
     # don't complain if tests don't hit defensive assertion code
-    # ...
+    raise AssertionError
+    raise NotImplementedError
 
     # don't complain if non-runnable code isn't run
+    if 0:
     if __name__ == .__main__.:
 
+# Don't include files that are 100% covered
+skip_covered = True
+
 # ignore source code that can’t be found
 ignore_errors = True
 

.gitignore

@@ -14,6 +14,7 @@ MANIFEST
 build
 dist
 .DS_Store
-tests/.coverage*
 .tox/
 .pytest_cache/
+.coverage*
+htmlcov/

.gitmodules

@@ -2,3 +2,6 @@
 	path = tests/data
 	url = https://github.com/adobe-type-tools/psautohint-testdata.git
 	ignore = dirty
+[submodule "multibuild"]
+	path = multibuild
+	url = https://github.com/matthew-brett/multibuild/

.travis.yml

@@ -1,43 +1,82 @@
 dist: trusty
-sudo: false
-
+sudo: required
 language: python
+# The travis Python version is unrelated to the version we build and test
+# with.  This is set with the MB_PYTHON_VERSION variable.
+python: 3.5
+services: docker
+
+branches:
+  only:
+    - master
+    # We want to build wip/* branches since these are not usually used for PRs
+    - /^wip\/.*$/
+    # We want to build version tags as well.
+    - /^v\d+\.\d+.*$/
+
+env:
+  global:
+    # directory containing the project source
+    - REPO_DIR=.
+    # pip dependencies to _build_ project
+    # - BUILD_DEPENDS="..."
+    # pip dependencies to _test_ project
+    - TEST_DEPENDS="-rdev-requirements.txt"
+    - PLAT=x86_64
+    - UNICODE_WIDTH=32
+    - TWINE_USERNAME=adobe-type-tools-ci
+    # TWINE_PASSWORD is set in Travis settings
 
 matrix:
+  exclude:
+    # Exclude the default Python 3.5 build
+    - python: 3.5
   include:
-    - python: 2.7
-      env: TOXENV=py27-cov
-    - python: 3.6
-      env: TOXENV=py36-cov
-    # The 'osx' environment uses the python2.7 by default.
-    # TODO: maybe also tests python3 on macOS
-    - language: generic
-      os: osx
-      env: TOXENV=py27-cov
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=2.7
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.6
+    - os: osx
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=2.7
+    - os: osx
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=3.6
+
+cache: pip
+
+before_install:
+  - source multibuild/common_utils.sh
+  - source multibuild/travis_steps.sh
+  - before_install
 
 install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-      curl -O https://bootstrap.pypa.io/get-pip.py;
-      python get-pip.py --user;
-      python -m pip install --user virtualenv;
-      python -m virtualenv .venv/;
-      source .venv/bin/activate;
-    fi
-  - pip install --upgrade pip
-  - pip install -r requirements.txt
-  - pip install -r dev-requirements.txt
+  - build_wheel $REPO_DIR $PLAT
 
 script:
-  - tox
-  - tox -e bdist
+  - install_run $PLAT
 
 after_success:
+  - pip install tox
+  # upload code coverage to Codecov.io
   - tox -e codecov
+  # if tagged, create the source distribution for the deploy stage
+  - if [ -n "$TRAVIS_TAG" ] && [ "$BUILD_SDIST" == true ]; then tox -e sdist; fi
+  # copy compiled wheels to dist/ where Travis `dpl` tool can find them and upload to PyPI
+  - if [ -n "$TRAVIS_TAG" ]; then mkdir -p dist; cp wheelhouse/*.whl dist; fi
 
-branches:
-  only:
-    - master
-    # We want to build wip/* branches since these are not usually used for PRs
-    - /^wip\/.*$/
-    # We want to build version tags as well.
-    - /^v\d+\.\d+.*$/
+deploy:
+  provider: pypi
+  on:
+    tags: true
+    repo: adobe-type-tools/psautohint
+    all_branches: true
+  # 'check' is a do-nothing setup.py command, to prevent Travis from trying
+  # to rebuild the wheel we just built with multibuild
+  distributions: check
+  skip_cleanup: true
+  skip_upload_docs: true

config.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Define custom utilities
+# Test for OSX with [ -n "$IS_OSX" ]
+
+function pre_build {
+    # Any stuff that you need to do before you start building the wheels
+    # Runs in the root directory of this repository.
+    :
+}
+
+function run_tests {
+    # The function is called from an empty temporary directory.
+    cd ..
+
+    # Get absolute path to the pre-compiled wheel
+    wheelhouse=$(abspath wheelhouse)
+    wheel=$(ls ${wheelhouse}/psautohint*.whl | head -n 1)
+    if [ ! -e "${wheel}" ]; then
+        echo "error: can't find wheel in ${wheelhouse} folder" 1>&2
+        exit 1
+    fi
+
+    # select tox environment based on the current python version
+    # E.g.: '2.7' -> 'py27-cov'
+    TOXENV="py${MB_PYTHON_VERSION//\./}-cov"
+
+    # Install pre-compiled wheel and run tests against it
+    tox --installpkg "${wheel}" -e "${TOXENV}"
+
+    # clean up after us, or else running tox later on outside the docker
+    # container can lead to permission errors
+    rm -rf .tox
+}

dev-requirements.txt

@@ -1,6 +1 @@
-# required for formatting the 'long_description' as Markdown
-setuptools>=36.4.0
-wheel>=0.31.0
-
-coverage>=4.5.1
 tox>=2.9.1

python/psautohint/__main__.py

@@ -737,7 +737,7 @@ def main(args=None):
     options = get_options(args)
 
     if options.logFile:
-        open(options.logFile, 'w')
+        open(options.logFile, 'w', encoding="utf-8")
 
     try:
         hintFiles(options)

python/psautohint/otfFont.py

@@ -1312,7 +1312,7 @@ def getfdInfo(self, fontPSName, inputPath, allow_no_blues, noFlex,
         srcFontInfo = os.path.dirname(inputPath)
         srcFontInfo = os.path.join(srcFontInfo, "fontinfo")
         if os.path.exists(srcFontInfo):
-            with open(srcFontInfo, "rU") as fi:
+            with open(srcFontInfo, "r", encoding="utf-8") as fi:
                 fontInfoData = fi.read()
             fontInfoData = re.sub(r"#[^\r\n]+", "", fontInfoData)
         else:
@@ -1368,7 +1368,7 @@ def test2():
     # Takes first argument = bez path, writes T2 string.
     # Use form "cid0769" for CID keys references.
     path = sys.argv[1]
-    with open(path, "rt") as fp:
+    with open(path, "rt", encoding="utf-8") as fp:
         bezString = fp.read()
 
     convertBezToT2(bezString)