Merge pull request #773 from googlefonts/support-pypy

Add testing with pypy3
googlefonts · Aug 9, 2021 · 47fb3f2 · 47fb3f2
2 parents f9190f1 + f488316
commit 47fb3f2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,8 +27,11 @@ jobs:
     if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "pypy-3.7"]
         platform: [ubuntu-latest, windows-latest]
+        exclude:
+          - platform: windows-latest
+            python-version: "pypy-3.7"
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/Lib/fontmake/__main__.py b/Lib/fontmake/__main__.py
@@ -521,6 +521,10 @@ def main(args=None):
             logging.exception(e)
             sys.exit(1)
         sys.exit(f"fontmake: Error: {str(e)}")
+    finally:
+        debug_feature_file = args.get("debug_feature_file")
+        if debug_feature_file is not None:
+            debug_feature_file.close()
 
 
 if __name__ == "__main__":

diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,12 @@
-fonttools[unicode,ufo,lxml]==4.22.0
-cu2qu==1.6.7
+fonttools[unicode,ufo,lxml]==4.22.0 ; platform_python_implementation == 'CPython'
+fonttools[unicode,ufo]==4.22.0 ; platform_python_implementation != 'CPython'
+cu2qu==1.6.7.post1
 glyphsLib==5.3.2
 ufo2ft[pathops]==2.21.0
 MutatorMath==3.0.1
 fontMath==0.6.0
-defcon[lxml]==0.8.1
+defcon[lxml]==0.8.1 ; platform_python_implementation == 'CPython'
+defcon==0.8.1 ; platform_python_implementation != 'CPython'
 booleanOperations==0.9.0
 ufoLib2==0.8.0
 attrs==20.3.0

diff --git a/setup.py b/setup.py
@@ -42,12 +42,11 @@
     setup_requires=wheel + ["setuptools_scm"],
     python_requires=">=3.6",
     install_requires=[
-        "fonttools[ufo,lxml,unicode]>=4.21.1",
-        "cu2qu>=1.6.7",
+        "fonttools[ufo,lxml,unicode]>=4.21.1 ; platform_python_implementation == 'CPython'",
+        "fonttools[ufo,unicode]>=4.21.1 ; platform_python_implementation != 'CPython'",
         "glyphsLib>=5.3.2",
         "ufo2ft[compreffor]>=2.20.0",
         "fontMath>=0.6.0",
-        "booleanOperations>=0.9.0",
         "ufoLib2>=0.8.0",
         "attrs>=19",
     ],

diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1,5 +1,5 @@
 pytest>=4.5.0
 coverage>=5
-black
-isort
-flake8-bugbear
+black ; platform_python_implementation == 'CPython'
+isort ; platform_python_implementation == 'CPython'
+flake8-bugbear ; platform_python_implementation == 'CPython'
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = lint, py3{6,7,8,9}, coverage-report
+envlist = lint, py3{6,7,8,9}, pypy3, coverage-report
 skip_missing_interpreters = true
 
 [testenv]