From cf28372e2d63cacef40798338aba0071bc7055a2 Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <clupo@google.com>
Date: Mon, 14 Nov 2022 13:48:39 +0000
Subject: [PATCH] cerry-pick packaging & ci changes from reverted PR #2879

---
 .github/workflows/test.yml | 16 ++++++++++------
 setup.py                   |  6 +++++-
 tox.ini                    |  7 +++++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 812df445b..ae9b341e0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,6 +9,10 @@ on:
 permissions:
   contents: read
 
+env:
+  # turns off tox's output redirection so we can debug package installation
+  TOX_OPTIONS: -vv
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -46,9 +50,9 @@ jobs:
     - name: Install packages
       run: pip install tox coverage
     - name: Run Tox
-      run: tox -e py-cov
+      run: tox $TOX_OPTIONS -e py-cov
     - name: Run Tox without lxml
-      run: tox -e py-cov-nolxml
+      run: tox $TOX_OPTIONS -e py-cov-nolxml
     - name: Produce coverage files
       run: |
         coverage combine
@@ -71,11 +75,11 @@ jobs:
     - name: Set up Python 3.x
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.11"
     - name: Install packages
       run: pip install tox
     - name: Run Tox
-      run: tox -e py-cy-nolxml
+      run: tox $TOX_OPTIONS -e py-cy-nolxml
 
   test-pypy3:
     runs-on: ubuntu-latest
@@ -85,8 +89,8 @@ jobs:
     - name: Set up Python pypy3
       uses: actions/setup-python@v4
       with:
-        python-version: "pypy-3.7"
+        python-version: "pypy-3.8"
     - name: Install packages
       run: pip install tox
     - name: Run Tox
-      run: tox -e pypy3-nolxml
+      run: tox $TOX_OPTIONS -e pypy3-nolxml
diff --git a/setup.py b/setup.py
index 960a73b78..928235c4a 100755
--- a/setup.py
+++ b/setup.py
@@ -153,7 +153,11 @@ classifiers = {"classifiers": [
 	"Natural Language :: English",
 	"Operating System :: OS Independent",
 	"Programming Language :: Python",
-	"Programming Language :: Python :: 2",
+	"Programming Language :: Python :: 3.7",
+	"Programming Language :: Python :: 3.8",
+	"Programming Language :: Python :: 3.9",
+	"Programming Language :: Python :: 3.10",
+	"Programming Language :: Python :: 3.11",
 	"Programming Language :: Python :: 3",
 	"Topic :: Text Processing :: Fonts",
 	"Topic :: Multimedia :: Graphics",
diff --git a/tox.ini b/tox.ini
index 22b1de742..0149f3092 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.0
-envlist = mypy, py3{7,8,9}-cov, htmlcov
+envlist = mypy, py3{7,8,9,10,11}-cov, htmlcov
 skip_missing_interpreters=true
 
 [testenv]
@@ -11,12 +11,15 @@ setenv =
 # relatively recent 'manylinux2014' platform tag.
 # https://github.com/tox-dev/tox/issues/791#issuecomment-518713438
 download = true
+# building lxml from source takes too long on CI, force it to download pre-compiled
+# wheel or fail if none is found with --only-binary=lxml
+install_command = python -m pip install --only-binary=lxml {opts} {packages}
 deps =
     cov: coverage>=4.3
     pytest
     pytest-randomly
     -rrequirements.txt
-    !nolxml: lxml==4.6.4
+    !nolxml: lxml==4.9.0
 extras =
     ufo
     woff