Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
josh-hadley committed Dec 16, 2019
2 parents d38eb3c + b4df44f commit 9289262
Show file tree
Hide file tree
Showing 2,484 changed files with 237,008 additions and 6,764 deletions.
38 changes: 21 additions & 17 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ image: Visual Studio 2017

environment:
global:
CIBW_BUILD: cp36-win_amd64
CIBW_TEST_REQUIRES: pytest
CIBW_TEST_COMMAND: cd {project} && pytest && pip uninstall --yes afdko
TWINE_USERNAME: adobe-type-tools-ci
# Note: TWINE_PASSWORD is set in AppVeyor settings
PYTHON_HOME: C:\Python36-x64
Expand All @@ -15,22 +12,37 @@ matrix:
# Do not build feature branch with open Pull Requests
skip_branch_with_pr: true

# scripts that run after cloning repository
install:
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\Scripts;%PATH%
- python --version
- python -c "import struct; print(struct.calcsize('P') * 8)"
- python -m pip install --disable-pip-version-check --upgrade pip
- python -m pip install --disable-pip-version-check -U -q pip setuptools wheel pytest
- python -m pip --version
- python -m pip list

# to run your custom scripts instead of automatic MSBuild
build_script:
# our setup.py requires 'wheel', which may not be already installed
- python -m pip install cibuildwheel wheel
- cibuildwheel --output-dir wheelhouse
- python setup.py bdist_wheel || EXIT /B 1

test_script:
# run the tests only on untagged commits
- ps: >-
if ($env:APPVEYOR_REPO_TAG -ne "true") {
$WHEEL = Resolve-Path "dist\*.whl" | Select -ExpandProperty Path
if ($WHEEL -eq $null) { echo "ERROR: Wheel file not found."; exit 1 }
python -m pip install $WHEEL
if ($LastExitCode -ne 0) { exit $LastExitCode }
python -m pytest
if ($LastExitCode -ne 0) { exit $LastExitCode }
python -m pip uninstall --yes afdko
if ($LastExitCode -ne 0) { exit $LastExitCode }
}
artifacts:
# archive the generated packages in the ci.appveyor.com build report
- path: wheelhouse\*.whl
- path: dist\*.whl
name: Wheels

on_success:
Expand All @@ -39,7 +51,7 @@ on_success:
if ($env:APPVEYOR_REPO_TAG -eq "true") {
Write-Output ("Deploying " + $env:APPVEYOR_REPO_TAG_NAME + " to PyPI...")
python -m pip install twine
python -m twine upload wheelhouse/*.whl
python -m twine upload dist/*.whl
}
deploy:
Expand All @@ -52,11 +64,3 @@ deploy:
prerelease: true
on:
appveyor_repo_tag: true

notifications:
- provider: Email
to:
- [email protected]
on_build_success: false
on_build_failure: true
on_build_status_changed: false
5 changes: 3 additions & 2 deletions .circleci/check_source_code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ flake8 convertfonttocid.py
flake8 fdkutils.py
flake8 makeinstancesufo.py
flake8 makeotf.py
flake8 otc2otf.py
flake8 otf2ttf.py
flake8 otfpdf.py
flake8 pdfmetrics.py
flake8 pdflib/otfpdf.py
flake8 pdflib/pdfmetrics.py
flake8 ttfcomponentizer.py
flake8 ttxn.py
flake8 ufotools.py
Expand Down
10 changes: 7 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ jobs:
command: |
source venv/bin/activate
$PYTHON setup.py bdist_wheel
$PIP install dist/*.whl
echo 'Installing afdko ...'
$PIP install dist/*.whl -q
$PIP list
$PYTHON -m pytest --cov
codecov
$PIP uninstall --yes afdko
Expand All @@ -47,8 +49,10 @@ jobs:
name: "Build wheel, run tests, and uninstall"
command: |
source venv/bin/activate
$PIP wheel . --no-deps -w dist
$PIP install dist/*.whl
$PYTHON setup.py bdist_wheel
echo 'Installing afdko ...'
$PIP install dist/*.whl -q
$PIP list
$PYTHON -m pytest
$PIP uninstall --yes afdko
# - store_artifacts:
Expand Down
3 changes: 1 addition & 2 deletions .circleci/setup_linux_pyenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ $PYTHON -m venv venv
# activate virtual environment
source venv/bin/activate
# install and update dependencies
$PIP install --disable-pip-version-check -U -q pip setuptools wheel flake8 cpplint
$PIP install pytest-cov codecov
$PIP install --disable-pip-version-check -U -q pip setuptools wheel flake8 cpplint pytest-cov codecov
# print versions
$PYTHON --version
$PIP --version
Expand Down
3 changes: 1 addition & 2 deletions .circleci/setup_mac_pyenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ $PYTHON -m venv venv
# activate virtual environment
source venv/bin/activate
# install and update dependencies
$PIP install --disable-pip-version-check -U -q pip setuptools wheel
$PIP install pytest
$PIP install --disable-pip-version-check -U -q pip setuptools wheel pytest
# print versions
$PYTHON --version
$PIP --version
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.cff* binary
*.pdf binary
*.pfa text eol=lf
*.pfb binary
Expand Down
12 changes: 12 additions & 0 deletions .lgtm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
extraction:
python:
python_setup:
version: 3
requirements: "cython>=0.29"
cpp:
after_prepare:
- "pip3 install --upgrade --user cython"
- "pip3 install --upgrade --user wheel"
- "export PATH=\"$HOME/.local/bin:$PATH\""
index:
build_command: "python3 setup.py build"
39 changes: 29 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ python: 3.6

env:
global:
- CIBW_BUILD="cp36-macosx_10_6_intel cp36-manylinux1_x86_64"
- CIBW_BEFORE_BUILD_LINUX="pip install --disable-pip-version-check -U -q pip"
- CIBW_TEST_REQUIRES="pytest"
- CIBW_TEST_COMMAND="cd {project} && pytest && pip uninstall --yes afdko"
- TWINE_USERNAME="adobe-type-tools-ci"
# Note: TWINE_PASSWORD is set in Travis settings

Expand All @@ -20,27 +16,50 @@ matrix:
- NAME=Linux
- PIP=pip
- PYTHON=python
- CIBW_BUILD="cp36-manylinux1_x86_64"
- CIBW_BEFORE_BUILD="pip install --disable-pip-version-check -U -q pip"

- os: osx
osx_image: xcode9.4
language: generic
env:
- NAME=OSX
- PIP=pip3
- PYTHON=python3

script:
- $PIP install --upgrade pip
# - $PIP install cibuildwheel
- $PIP install git+https://github.com/adobe-type-tools/cibuildwheel
- cibuildwheel --output-dir wheelhouse
- |
set -e
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
$PIP install --disable-pip-version-check -U -q pip setuptools wheel pytest
$PYTHON --version
$PIP --version
$PIP list
$PYTHON setup.py bdist_wheel
if [[ -z $TRAVIS_TAG ]]; then
# run the tests only on untagged commits
$PIP install dist/*.whl
pytest
$PIP uninstall --yes afdko
fi
else
if [[ -z $TRAVIS_TAG ]]; then
# run the tests only on untagged commits
export CIBW_TEST_REQUIRES='pytest'
export CIBW_TEST_COMMAND='cd {project} && pytest && pip uninstall --yes afdko'
fi
$PIP install --disable-pip-version-check -U -q pip
$PIP install cibuildwheel
cibuildwheel --output-dir dist
fi
after_success:
# create source distribution
# and deploy to PyPI on tags
- |
if [[ $TRAVIS_TAG ]]; then
$PYTHON -m pip install twine
$PYTHON -m twine upload wheelhouse/*.whl
$PYTHON -m twine upload dist/*.whl
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
$PYTHON setup.py sdist
$PYTHON -m twine upload dist/*.tar.gz
Expand All @@ -55,7 +74,7 @@ deploy:
skip_cleanup: true
file_glob: true
file:
- wheelhouse/*.whl
- dist/*.whl
- dist/*.tar.gz
prerelease: true
on:
Expand Down
79 changes: 76 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,79 @@
Changelog
=========

3.1.0 (released 2019-12-16)
---------------------------
- [ci] updates and maintenance on several CI services:
- added LGTM.com (Semmle) analyze-on-Pull-Request support
- removed Codacy check
- set up Azure Pipeline with Mac, Windows, and Linux testing
- [tests] Add filtering for fontTools `DeprecationWarnings`
- [tx] Add descriptions of optimization options (`tx -cff` help)
([#938](https://github.com/adobe-type-tools/afdko/pull/938),
[#939](https://github.com/adobe-type-tools/afdko/pull/939))
- [tx] Fix handling of blend options
([#940](https://github.com/adobe-type-tools/afdko/issues/940),
[#941](https://github.com/adobe-type-tools/afdko/pull/941))
- [fdkutils] Improve shell command handling, increase test coverage
([#946](https://github.com/adobe-type-tools/afdko/pull/946))
- [comparefamily] Trim `agd.py` to only parts needed to keep
`comparefamily` running
([#948](https://github.com/adobe-type-tools/afdko/pull/948))
- [tx tests] Improved tests
([#949](https://github.com/adobe-type-tools/afdko/pull/949),
[#950](https://github.com/adobe-type-tools/afdko/pull/951))
- [fdkutils] Add TTC support
([#952](https://github.com/adobe-type-tools/afdko/pull/952))
- [tx] Add variable font support to ttread
([#957](https://github.com/adobe-type-tools/afdko/pull/957))
- [tx] A whole bunch of improvements and fixes
([#929](https://github.com/adobe-type-tools/afdko/pull/929),
[#954](https://github.com/adobe-type-tools/afdko/pull/954),
[#955](https://github.com/adobe-type-tools/afdko/pull/955),
[#956](https://github.com/adobe-type-tools/afdko/pull/956),
[#958](https://github.com/adobe-type-tools/afdko/pull/958),
[#959](https://github.com/adobe-type-tools/afdko/pull/959),
[#960](https://github.com/adobe-type-tools/afdko/pull/960),
[#961](https://github.com/adobe-type-tools/afdko/pull/961),
[#962](https://github.com/adobe-type-tools/afdko/pull/962),
[#964](https://github.com/adobe-type-tools/afdko/pull/964),
[#1045](https://github.com/adobe-type-tools/afdko/issues/1045),
[#1046](https://github.com/adobe-type-tools/afdko/pull/1046))
- [makeotfexe] Fix memory consumption issue
([#968](https://github.com/adobe-type-tools/afdko/pull/968),
[#965](https://github.com/adobe-type-tools/afdko/issues/965))
- [makeotfexe] Import fealib tests (thanks @khaledhosny!)
([#973](https://github.com/adobe-type-tools/afdko/pull/973))
- [makeinstancesufo] Fix potential issue with temp files
([#976](https://github.com/adobe-type-tools/afdko/pull/976))
- [otc2otf] Rewrite, fix `-t` option, increase test coverage
([#978](https://github.com/adobe-type-tools/afdko/pull/978))
- [python][c] Numerous fixes for LGTM-reported issues
([LGTM.com/afdko](https://lgtm.com/projects/g/adobe-type-tools/afdko/history/))
- [makeotf] Fix path issue in Mac OS X 10.15 Catalina
([#991](https://github.com/adobe-type-tools/afdko/pull/991))
- [requirements] Relax pinning
([#997](https://github.com/adobe-type-tools/afdko/pull/997),
[#408](https://github.com/adobe-type-tools/afdko/issues/408))
- [fea-spec]
- Fix example for mark glyph positioning (thanks @anthrotype!)
([#999](https://github.com/adobe-type-tools/afdko/pull/999))
- Improve formatting and grammar (thanks @sergeresko!)
([#1031](https://github.com/adobe-type-tools/afdko/pull/1031))
- [otf2ttf] Enhance for Collections, parallel processing, and file wildcards (thanks @msoxzw!)
([#1000](https://github.com/adobe-type-tools/afdko/pull/1000))
- [makeotfexe] Increase code coverage (thanks @khaledhosny!)
([#1008](https://github.com/adobe-type-tools/afdko/pull/1008))
- [docs] update documentation of hex format for GlyphOrderAndAliasDB, multiple Unicodes (thanks @benkiel!)
([#1028](https://github.com/adobe-type-tools/afdko/pull/1028),
[#1024](https://github.com/adobe-type-tools/afdko/pull/1024))
- [makeotfexe] fix calculation of OS/2.ulCodePageRange bits
([#1039](https://github.com/adobe-type-tools/afdko/pull/1042),
[#1040](https://github.com/adobe-type-tools/afdko/issues/1040))
- [dependencies] Update `psautohint` and `fontTools` to latest
([#1043](https://github.com/adobe-type-tools/afdko/pull/1043),
[#1057](https://github.com/adobe-type-tools/afdko/pull/1057))

3.0.1 (released 2019-08-22)
---------------------------

Expand Down Expand Up @@ -511,8 +584,8 @@ checkOutlines to the newer `checkOutlinesUFO` (which does work with
OpenType and Type 1 fonts, but currently does only overlap detection and
removal, and a few basic path checks).

Older releases can be downloaded and installed from the [Adobe's AFDKO
home page](http://www.adobe.com/devnet/opentype/afdko.html).
Older releases can be downloaded from the [repository's Releases
page](https://github.com/adobe-type-tools/afdko/releases?after=2.6.22).

2.5.66097 (released 2017-12-01)
-------------------------------
Expand Down Expand Up @@ -2915,4 +2988,4 @@ complete list see:

- changed logic for setting OS/2 codepage range to set code page to
Simplified or Traditional Chinese based on mac.script setting;
fallback on heuristics only if mac.script is not set.
fallback on heuristics only if mac.script is not set.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[![PyPI](https://img.shields.io/pypi/v/afdko.svg)](https://pypi.org/project/afdko)

[![Travis](https://travis-ci.org/adobe-type-tools/afdko.svg?branch=develop)](https://travis-ci.org/adobe-type-tools/afdko)
[![Appveyor](https://ci.appveyor.com/api/projects/status/qurx2si4x54b97mt/branch/develop?svg=true)](https://ci.appveyor.com/project/adobe-type-tools/afdko/branch/develop)
[![CircleCI](https://circleci.com/gh/adobe-type-tools/afdko/tree/develop.svg?style=svg)](https://circleci.com/gh/adobe-type-tools/afdko/tree/develop)
[![Codacy](https://api.codacy.com/project/badge/Grade/08ceff914833445685924ebb1f040070)](https://www.codacy.com/app/adobe-type-tools/afdko?utm_source=github.com&utm_medium=referral&utm_content=adobe-type-tools/afdko&utm_campaign=Badge_Grade)
[![Azure Pipelines](https://dev.azure.com/adobe-type-tools/afdko/_apis/build/status/adobe-type-tools.afdko?branchName=develop)](https://dev.azure.com/adobe-type-tools/afdko/_build/latest?definitionId=1&branchName=develop)

[![Coverage](https://codecov.io/gh/adobe-type-tools/afdko/branch/develop/graph/badge.svg)](https://codecov.io/gh/adobe-type-tools/afdko/branch/develop)
[![PyPI](https://img.shields.io/pypi/v/afdko.svg)](https://pypi.org/project/afdko)

[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/adobe-type-tools/afdko.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/adobe-type-tools/afdko/context:cpp)
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/adobe-type-tools/afdko.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/adobe-type-tools/afdko/context:python)
[![Total alerts](https://img.shields.io/lgtm/alerts/g/adobe-type-tools/afdko.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/adobe-type-tools/afdko/alerts/)

Adobe Font Development Kit for OpenType (AFDKO)
===============================================
Expand Down
Loading

0 comments on commit 9289262

Please sign in to comment.