Skip to content

Commit abb8a13

Browse files
authored
Merge pull request #46 from fonttools/support-pypy3
Make pypy 7.3 wheels for Linux
2 parents 7468700 + c535ea5 commit abb8a13

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

.github/workflows/ci.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,31 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
python-version: [3.6, 3.7, 3.8, 3.9]
20+
python-version: [3.6, 3.7, 3.8, 3.9, "pypy3.7-7.3.5"]
2121
os: [ubuntu-latest, macos-latest]
2222
platform: [x64]
23+
exclude:
24+
- os: macos-latest
25+
python-version: "pypy3.7-7.3.5"
2326
env:
2427
REPO_DIR: "."
2528
PLAT: "x86_64"
2629
UNICODE_WIDTH: 32
30+
MB_PYTHON_VERSION: "${{ matrix.python-version }}"
2731
MB_ML_VER: 2014
32+
DOCKER_TEST_IMAGE: "multibuild/xenial_x86_64"
2833
TEST_DEPENDS: "tox"
29-
MB_PYTHON_VERSION: ${{ matrix.python-version }}
30-
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
3134
BUILD_SKIA_FROM_SOURCE: 0
3235
SKIA_LIBRARY_DIR: "build/download"
3336

3437
steps:
3538
- uses: actions/checkout@v2
3639
with:
3740
submodules: recursive
38-
- name: Set up Python ${{ matrix.python-version }}
41+
- name: Set up Python 3.x
3942
uses: actions/setup-python@v2
4043
with:
41-
python-version: ${{ matrix.python-version }}
44+
python-version: "3.x"
4245
- name: Set up environment variables
4346
run: |
4447
if [ "macos-latest" == "${{ matrix.os }}" ]; then

config.sh

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ function run_tests {
1919
exit 1
2020
fi
2121

22-
# select tox environment based on the current python version
23-
# E.g.: '2.7' -> 'py27'
24-
TOXENV="py${MB_PYTHON_VERSION//\./}"
25-
2622
# Install pre-compiled wheel and run tests against it
27-
tox --installpkg "${wheel}" -e "${TOXENV}"
23+
tox --installpkg "${wheel}" -e py
2824

2925
# clean up after us, or else running tox later on outside the docker
3026
# container can lead to permission errors

0 commit comments

Comments
 (0)