Skip to content

Commit bfdfc1d

Browse files
Merge pull request #45 from source-foundry/dev
v1.0.2
2 parents 4e037f5 + 2206450 commit bfdfc1d

File tree

4 files changed

+36
-9
lines changed

4 files changed

+36
-9
lines changed

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ matrix:
3232
install: pip install --upgrade tox pytest pytest-asyncio
3333
dist: xenial
3434
script: tox -e $TOX_ENV
35+
- python: 3.8
36+
env: TOX_ENV=py38
37+
install: pip install --upgrade tox pytest pytest-asyncio
38+
dist: xenial
39+
script: tox -e $TOX_ENV
3540
- os: osx
3641
language: generic
37-
osx_image: xcode11 # Python 3.7.4 running on macOS 10.14.4
42+
osx_image: xcode11 # Python 3.7.4 running on macOS 10.14.4
3843
install: pip3 install --upgrade tox pytest pytest-asyncio
3944
env: TOX_ENV=py37
4045
script: tox -e $TOX_ENV
@@ -51,4 +56,4 @@ branches:
5156
- /^v\d+\.\d+.*$/
5257

5358
notifications:
54-
email: false
59+
email: false

appveyor.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@ environment:
44
PYTHON_HOME: "C:\\Python36"
55
TOX_PY: py36
66

7+
- JOB: "3.6 64-bit"
8+
PYTHON_HOME: "C:\\Python36-x64"
9+
TOX_PY: py36
10+
711
- JOB: "3.7 64-bit"
812
PYTHON_HOME: "C:\\Python37-x64"
913
TOX_PY: py37
1014

15+
- JOB: "3.8 64-bit"
16+
PYTHON_HOME: "C:\\Python38-x64"
17+
TOX_PY: py38
18+
1119
install:
1220
# Prepend Python to the PATH of this build
1321
- "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;%PATH%"
1422

1523
# check that we have the expected version and architecture for Python
1624
- "python --version"
17-
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
25+
- 'python -c "import struct; print(struct.calcsize(''P'') * 8)"'
1826

1927
# upgrade pip and setuptools to avoid out-of-date warnings
2028
- "python -m pip install --disable-pip-version-check --user --upgrade pip setuptools virtualenv"

lib/fdiff/diff.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,14 @@ def u_diff(
192192
with tempfile.TemporaryDirectory() as tmpdirpath:
193193
# define the file paths with either local file requests
194194
# or HTTP GET requests of remote files based on the command line request
195-
left_ttxpath, right_ttxpath, pre_pathname, prepath, post_pathname, postpath = _get_fonts_and_save_xml(
195+
(
196+
left_ttxpath,
197+
right_ttxpath,
198+
pre_pathname,
199+
prepath,
200+
post_pathname,
201+
postpath,
202+
) = _get_fonts_and_save_xml(
196203
filepath_a,
197204
filepath_b,
198205
tmpdirpath,
@@ -249,7 +256,14 @@ def external_diff(
249256
with tempfile.TemporaryDirectory() as tmpdirpath:
250257
# define the file paths with either local file requests
251258
# or HTTP GET requests of remote files based on the command line request
252-
left_ttxpath, right_ttxpath, pre_pathname, prepath, post_pathname, postpath = _get_fonts_and_save_xml(
259+
(
260+
left_ttxpath,
261+
right_ttxpath,
262+
pre_pathname,
263+
prepath,
264+
post_pathname,
265+
postpath,
266+
) = _get_fonts_and_save_xml(
253267
filepath_a,
254268
filepath_b,
255269
tmpdirpath,

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
#
55
# pip-compile
66
#
7-
aiodns==2.0.0
8-
aiofiles==0.4.0
9-
aiohttp==3.6.2
7+
aiodns==2.0.0 # via fdiff (setup.py)
8+
aiofiles==0.4.0 # via fdiff (setup.py)
9+
aiohttp==3.6.2 # via fdiff (setup.py)
1010
async-timeout==3.0.1 # via aiohttp
1111
attrs==19.3.0 # via aiohttp
1212
cffi==1.14.0 # via pycares
1313
chardet==3.0.4 # via aiohttp
14-
fonttools==4.6.0
14+
fonttools==4.6.0 # via fdiff (setup.py)
1515
idna==2.9 # via yarl
1616
multidict==4.7.5 # via aiohttp, yarl
1717
pycares==3.1.1 # via aiodns

0 commit comments

Comments
 (0)