Skip to content

Commit

Permalink
re-add python 2.7 test workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
fdintino committed Sep 12, 2023
1 parent 09ed9ac commit 2ca4597
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/linux-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,23 @@

set -eo pipefail

aptget()
{
if [ $(id -u) == 0 ]; then
apt-get "$@"
else
sudo apt-get "$@"
fi
}

aptget_update()
{
if [ ! -z $1 ]; then
echo ""
echo "Retrying apt-get update..."
echo ""
fi
output=`sudo apt-get update 2>&1`
output=`aptget update 2>&1`
echo "$output"
if [[ $output == *[WE]:\ * ]]; then
return 1
Expand All @@ -19,11 +28,12 @@ aptget_update || aptget_update retry || aptget_update retry

set -e

sudo apt-get -qq install zlib1g-dev libpng-dev libjpeg-dev \
aptget -qq install zlib1g-dev libpng-dev libjpeg-dev sudo \
libxml2-dev libffi-dev libxslt-dev cmake ninja-build nasm

if [ "$GHA_PYTHON_VERSION" == "2.7" ]; then
python2 -m pip install tox tox-gh-actions
aptget install -y python3-pip
else
python3 -m pip install 'tox<4' tox-gh-actions
fi
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ jobs:
"3.9",
"3.8",
"3.7",
"2.7",
]
libavif-version: [ "0.11.0" ]
include:
- python-version: "3.7"
PYTHONOPTIMIZE: 1
Expand All @@ -29,17 +31,23 @@ jobs:
codecov-flag: GHA_Ubuntu
- os: macos-11
codecov-flag: GHA_macOS
exclude:
- python-version: "2.7"
os: "macos-11"

runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
name: ${{ matrix.os }} Python ${{ matrix.python-version }} (libavif ${{ matrix.libavif-version }})
container:
image: ${{ matrix.python-version == '2.7' && 'python:2.7-buster' || null }}

env:
LIBAVIF_VERSION: 0.11.0
LIBAVIF_VERSION: ${{ matrix.libavif-version }}

steps:
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
if: matrix.python-version != '2.7'
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
Expand Down Expand Up @@ -74,7 +82,6 @@ jobs:
if: failure()
run: |
mkdir -p tests/errors
shell: pwsh
- name: Upload errors
uses: actions/upload-artifact@v3
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ envlist = py{27,37,38,39,310,py37}
minversion = 1.9

[gh-actions]
problem_matcher = False
python =
2.7: py27
3.7: py37
Expand Down

0 comments on commit 2ca4597

Please sign in to comment.