Merge pull request #21 from source-foundry/py3

Python 3 updates, eliminate Python 2.7 support

Author: chrissimpkins

.travis.yml

@@ -4,19 +4,24 @@ sudo: false
 language: python
 matrix:
   include:
-    - python: 2.7
-      env: TOX_ENV=py27
-    - python: 2.7
-      env: TOX_ENV=py34
+    - python: 3.7
+      dist: xenial
+      env: TOX_ENV=lint
+      install: pip install flake8
+      script: flake8 --ignore=E501,W503 lib/fontline/*.py
     - python: 3.5
       env: TOX_ENV=py35
+      install: pip install tox
+      script: tox -e $TOX_ENV
     - python: 3.6
       env: TOX_ENV=py36
-
-script: tox -e $TOX_ENV
-
-install:
-    - pip install tox
+      install: pip install tox
+      script: tox -e $TOX_ENV
+    - python: 3.7
+      env: TOX_ENV=py37
+      install: pip install tox
+      dist: xenial
+      script: tox -e $TOX_ENV
 
 notifications:
   email: false

CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Changelog
 
+### v2.0.0
+
+- changed copyright notice from "Christopher Simpkins" to "Source Foundry Authors"
+- eliminated Python 2 interpreter support
+- updated shebang lines to `#!/usr/bin/env python3`
+- black formatting for source files
+- refactored Travis CI settings file
+- modified Travis CI testing to Python 3.5 - 3.7
+- refactored Appveyor CI settings file
+- modified Appveyor CI testing to Python 3.5 - 3.7
+- 
+
 ### v1.0.1
 
 - removed unused variables in commands module

README.md

@@ -2,10 +2,10 @@
 
 
 [![PyPI](https://img.shields.io/pypi/v/font-line.svg)](https://pypi.org/project/font-line)
-[![Build Status](https://semaphoreci.com/api/v1/sourcefoundry/font-line/branches/master/badge.svg)](https://semaphoreci.com/sourcefoundry/font-line)
+[![Build Status](https://travis-ci.org/source-foundry/font-line.svg?branch=master)](https://travis-ci.org/source-foundry/font-line)
 [![Build status](https://ci.appveyor.com/api/projects/status/2s4725o5mxh2298c/branch/master?svg=true)](https://ci.appveyor.com/project/chrissimpkins/font-line/branch/master) 
 [![codecov.io](https://codecov.io/github/source-foundry/font-line/coverage.svg?branch=master)](https://codecov.io/github/source-foundry/font-line?branch=master)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/38f100cc1ef74d568e1bab02ac162cbb)](https://app.codacy.com/app/SourceFoundry/font-line)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/d77b55866c794a5a9dd3b3dfea9ec318)](https://www.codacy.com/app/SourceFoundry/font-line)
 
 ## About
 font-line is a libre, open source command line tool for OpenType vertical metrics reporting and command line based font line spacing modifications.  It supports `.ttf` and `.otf` font builds.
@@ -21,17 +21,17 @@ font-line is a libre, open source command line tool for OpenType vertical metric
 
 ## Quickstart
 
-- Install: `$ pip install font-line`
+- Install: `$ pip3 install font-line`
 - Metrics Report: `$ font-line report [font path]`
 - Modify line spacing: `$ font-line percent [integer %] [font path]`
 - Help: `$ font-line --help`
 
 ## Install
 
-font-line is built with Python and is tested with Python 2.7 and Python 3.4+ interpreters. You can verify your installed Python version on the command line with the command:
+font-line is built with Python and is tested with Python 3.5+ interpreters. You can verify your installed Python version on the command line with the command:
 
 ```
-$ python --version
+$ python3 --version
 ```
 
 Use either of the following methods to install font-line on your system.
@@ -41,10 +41,10 @@ Use either of the following methods to install font-line on your system.
 The latest font-line release is available through the Python Package Index and can be installed with pip:
 
 ```
-$ pip install font-line
+$ pip3 install font-line
 ```
 
-To upgrade to a new version of font-line after a pip install, use the command `pip install --upgrade font-line`.
+To upgrade to a new version of font-line after a pip install, use the command `pip3 install --upgrade font-line`.
 
 ### Download Project Repository and Install
 
@@ -57,7 +57,7 @@ git clone https://github.com/source-foundry/font-line.git
 Navigate to the top level repository directory and enter the following command:
 
 ```
-$ python setup.py install
+$ pip3 install .
 ```
 
 Follow the same instructions to upgrade to a new version of the application if you install with this approach.
@@ -237,7 +237,7 @@ Please [submit a new issue report](https://github.com/source-foundry/font-line/i
 
 ## Acknowledgments
 
-font-line is built with the fantastic [fontTools](https://github.com/behdad/fonttools) Python library.
+font-line is built with the fantastic [fontTools](https://github.com/fonttools/fonttools) Python library.
 
 
 ## License

appveyor.yml

@@ -1,20 +1,46 @@
-build: false
 environment:
   matrix:
-    - TOXENV: py27
-    - TOXENV: py34
-    - TOXENV: py35
-    - TOXENV: py36
-platform:
-  - x86
-  - x64
-init:
-  - "ECHO %TOXENV%"
-  - ps: "ls C:\\Python*"
+    - JOB: "3.5 64-bit"
+      PYTHON_HOME: "C:\\Python35-x64"
+      TOX_PY: py35
+
+    - JOB: "3.6 64-bit"
+      PYTHON_HOME: "C:\\Python36-x64"
+      TOX_PY: py36
+
+    - JOB: "3.7 64-bit"
+      PYTHON_HOME: "C:\\Python37-x64"
+      TOX_PY: py37
+
+    - JOB: "3.7 32-bit"
+      PYTHON_HOME: "C:\\Python37"
+      TOX_PY: py37
+
 install:
-  - "c:\\python27\\Scripts\\pip install tox"
-test_script:
-  - "git clean -f -d -x"
-  - "c:\\python27\\Scripts\\tox --version"
-  - "c:\\python27\\Scripts\\pip --version"
-  - "c:\\python27\\Scripts\\tox"
+  # If there is a newer build queued for the same PR, cancel this one.
+  # The AppVeyor 'rollout builds' option is supposed to serve the same
+  # purpose but it is problematic because it tends to cancel builds pushed
+  # directly to master instead of just PR builds (or the converse).
+  # credits: JuliaLang developers.
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+          throw "There are newer queued builds for this pull request, failing early." }
+
+  # Prepend Python to the PATH of this build
+  - "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\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 and setuptools to avoid out-of-date warnings
+  - "python -m pip install --disable-pip-version-check --user --upgrade pip setuptools"
+
+  # install the test dependencies
+  - "python -m pip install tox"
+
+build: false
+
+test_script: 
+  - "tox -e %TOX_PY%"

docs/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Christopher Simpkins
+Copyright (c) 2018 Source Foundry Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

docs/README.rst

@@ -33,21 +33,19 @@ Contents
 Quickstart
 ~~~~~~~~~~
 
--  Install: ``$ pip install font-line``
+-  Install: ``$ pip3 install font-line``
 -  Metrics Report: ``$ font-line report [font path]``
 -  Modify line spacing: ``$font-line percent [integer %] [font path]``
 
 Install
 ~~~~~~~
 
-font-line is built with Python and can be used on systems with Python
-2.7+ and Python 3.3+ interpreters, including current releases of pypy
-and pypy3. You can verify your installed Python version on the command
+font-line is built with Python and can be used on systems with Python 3.5+ interpreters. You can verify your installed Python version on the command
 line with the command:
 
 ::
 
-    $ python --version
+    $ python3 --version
 
 Use either of the following methods to install font-line on your system.
 
@@ -59,10 +57,10 @@ Index and can be installed with pip:
 
 ::
 
-    $ pip install font-line
+    $ pip3 install font-line
 
 To upgrade to a new version of font-line after a pip install, use the
-command ``pip install --upgrade font-line``.
+command ``pip3 install --upgrade font-line``.
 
 Download Project Repository and Install
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -81,7 +79,7 @@ command:
 
 ::
 
-    $ python setup.py install
+    $ pip3 install .
 
 Follow the same instructions to upgrade to a new version of the
 application if you elect to install with this approach.
@@ -325,7 +323,7 @@ Acknowledgments
 ~~~~~~~~~~~~~~~
 
 font-line is built with the fantastic
-`fontTools <https://github.com/behdad/fonttools>`__ Python library.
+`fontTools <https://github.com/fonttools/fonttools>`__ Python library.
 
 .. |Build Status| image:: https://semaphoreci.com/api/v1/sourcefoundry/font-line/branches/master/badge.svg
    :target: https://semaphoreci.com/sourcefoundry/font-line

lib/fontline/__init__.py

@@ -1,4 +1,2 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
-

lib/fontline/app.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 """
@@ -14,7 +14,11 @@
 from standardstreams import stdout, stderr
 
 from fontline import settings
-from fontline.commands import get_font_report, modify_linegap_percent, get_linegap_percent_filepath
+from fontline.commands import (
+    get_font_report,
+    modify_linegap_percent,
+    get_linegap_percent_filepath,
+)
 from fontline.utilities import file_exists, is_supported_filetype
 
 # TODO: support integer addition and subtraction to the metrics values through new sub-commands
@@ -27,7 +31,9 @@ def main():
     c = Command()
 
     if c.does_not_validate_missing_args():
-        stderr("[font-line] ERROR: Please include one or more arguments with your command.")
+        stderr(
+            "[font-line] ERROR: Please include one or more arguments with your command."
+        )
         sys.exit(1)
 
     if c.is_help_request():
@@ -43,7 +49,9 @@ def main():
     # REPORT sub-command
     if c.subcmd == "report":
         if c.argc < 2:
-            stderr("[font-line] ERROR: Missing file path argument(s) after the report subcommand.")
+            stderr(
+                "[font-line] ERROR: Missing file path argument(s) after the report subcommand."
+            )
             sys.exit(1)
         else:
             for fontpath in c.argv[1:]:
@@ -53,9 +61,17 @@ def main():
                     if is_supported_filetype(fontpath):
                         stdout(get_font_report(fontpath))
                     else:
-                        stderr("[font-line] ERROR: '" + fontpath + "' does not appear to be a supported font file type.")
+                        stderr(
+                            "[font-line] ERROR: '"
+                            + fontpath
+                            + "' does not appear to be a supported font file type."
+                        )
                 else:
-                    stderr("[font-line] ERROR: '" + fontpath + "' does not appear to be a valid filepath.")
+                    stderr(
+                        "[font-line] ERROR: '"
+                        + fontpath
+                        + "' does not appear to be a valid filepath."
+                    )
     # PERCENT sub-command
     elif c.subcmd == "percent":
         if c.argc < 3:
@@ -65,29 +81,59 @@ def main():
             percent = c.argv[1]
             # test the percent integer argument
             try:
-                percent_int = int(percent)  # test that the argument can be cast to an integer value
+                percent_int = int(
+                    percent
+                )  # test that the argument can be cast to an integer value
                 if percent_int <= 0:
-                    stderr("[font-line] ERROR: Please enter a percent value that is greater than zero.")
+                    stderr(
+                        "[font-line] ERROR: Please enter a percent value that is greater than zero."
+                    )
                     sys.exit(1)
                 if percent_int > 100:
-                    stdout("[font-line] Warning: You entered a percent value over 100%. Please confirm that this is "
-                           "your intended metrics modification.")
+                    stdout(
+                        "[font-line] Warning: You entered a percent value over 100%. Please confirm that this is "
+                        "your intended metrics modification."
+                    )
             except ValueError:
-                stderr("[font-line] ERROR: You entered '" + percent + "'. This argument needs to be an integer value.")
+                stderr(
+                    "[font-line] ERROR: You entered '"
+                    + percent
+                    + "'. This argument needs to be an integer value."
+                )
                 sys.exit(1)
             for fontpath in c.argv[2:]:
                 if file_exists(fontpath):
                     if is_supported_filetype(fontpath):
                         if modify_linegap_percent(fontpath, percent) is True:
                             outpath = get_linegap_percent_filepath(fontpath, percent)
-                            stdout("[font-line] '" + fontpath + "' successfully modified to '" + outpath + "'.")
+                            stdout(
+                                "[font-line] '"
+                                + fontpath
+                                + "' successfully modified to '"
+                                + outpath
+                                + "'."
+                            )
                         else:  # pragma: no cover
-                            stderr("[font-line] ERROR: Unsuccessful modification of '" + fontpath + "'.")
+                            stderr(
+                                "[font-line] ERROR: Unsuccessful modification of '"
+                                + fontpath
+                                + "'."
+                            )
                     else:
-                        stderr("[font-line] ERROR: '" + fontpath + "' does not appear to be a supported font file type.")
+                        stderr(
+                            "[font-line] ERROR: '"
+                            + fontpath
+                            + "' does not appear to be a supported font file type."
+                        )
                 else:
-                    stderr("[font-line] ERROR: '" + fontpath + "' does not appear to be a valid filepath.")
+                    stderr(
+                        "[font-line] ERROR: '"
+                        + fontpath
+                        + "' does not appear to be a valid filepath."
+                    )
     else:
-        stderr("[font-lines] ERROR: You used an unsupported argument to the executable. Please review the"
-               " `font-line --help` documentation and try again.")
+        stderr(
+            "[font-lines] ERROR: You used an unsupported argument to the executable. Please review the"
+            " `font-line --help` documentation and try again."
+        )
         sys.exit(1)