Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,14 @@ matrix:
install: pip install --upgrade tox pytest pytest-asyncio
dist: xenial
script: tox -e $TOX_ENV
- python: 3.8
env: TOX_ENV=py38
install: pip install --upgrade tox pytest pytest-asyncio
dist: xenial
script: tox -e $TOX_ENV
- os: osx
language: generic
osx_image: xcode11 # Python 3.7.4 running on macOS 10.14.4
osx_image: xcode11 # Python 3.7.4 running on macOS 10.14.4
install: pip3 install --upgrade tox pytest pytest-asyncio
env: TOX_ENV=py37
script: tox -e $TOX_ENV
Expand All @@ -51,4 +56,4 @@ branches:
- /^v\d+\.\d+.*$/

notifications:
email: false
email: false
10 changes: 9 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,25 @@ environment:
PYTHON_HOME: "C:\\Python36"
TOX_PY: py36

- 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.8 64-bit"
PYTHON_HOME: "C:\\Python38-x64"
TOX_PY: py38

install:
# 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)\""
- '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 virtualenv"
Expand Down
18 changes: 16 additions & 2 deletions lib/fdiff/diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,14 @@ def u_diff(
with tempfile.TemporaryDirectory() as tmpdirpath:
# define the file paths with either local file requests
# or HTTP GET requests of remote files based on the command line request
left_ttxpath, right_ttxpath, pre_pathname, prepath, post_pathname, postpath = _get_fonts_and_save_xml(
(
left_ttxpath,
right_ttxpath,
pre_pathname,
prepath,
post_pathname,
postpath,
) = _get_fonts_and_save_xml(
filepath_a,
filepath_b,
tmpdirpath,
Expand Down Expand Up @@ -249,7 +256,14 @@ def external_diff(
with tempfile.TemporaryDirectory() as tmpdirpath:
# define the file paths with either local file requests
# or HTTP GET requests of remote files based on the command line request
left_ttxpath, right_ttxpath, pre_pathname, prepath, post_pathname, postpath = _get_fonts_and_save_xml(
(
left_ttxpath,
right_ttxpath,
pre_pathname,
prepath,
post_pathname,
postpath,
) = _get_fonts_and_save_xml(
filepath_a,
filepath_b,
tmpdirpath,
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
#
# pip-compile
#
aiodns==2.0.0
aiofiles==0.4.0
aiohttp==3.6.2
aiodns==2.0.0 # via fdiff (setup.py)
aiofiles==0.4.0 # via fdiff (setup.py)
aiohttp==3.6.2 # via fdiff (setup.py)
async-timeout==3.0.1 # via aiohttp
attrs==19.3.0 # via aiohttp
cffi==1.14.0 # via pycares
chardet==3.0.4 # via aiohttp
fonttools==4.6.0
fonttools==4.6.0 # via fdiff (setup.py)
idna==2.9 # via yarl
multidict==4.7.5 # via aiohttp, yarl
pycares==3.1.1 # via aiodns
Expand Down