Skip to content

Commit 7579e1d

Browse files
authored
Refactor CI, add formal support for py3.10 (#68)
* refactor CI, add formal support for py3.10 * fix? * it does not actually work on py34 :)
1 parent 76836d6 commit 7579e1d

File tree

3 files changed

+36
-40
lines changed

3 files changed

+36
-40
lines changed

.github/workflows/ci.yml

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,78 +8,74 @@ on:
88

99

1010
jobs:
11-
build:
11+
12+
lint-build:
13+
name: Linting
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Set up Python 3.9
20+
uses: actions/setup-python@v2
21+
with:
22+
python-version: 3.9
23+
- name: Install dependencies
24+
run: |
25+
python -m pip install --upgrade pip
26+
pip install invoke black flake8
27+
- name: Lint
28+
run: |
29+
invoke lint
30+
invoke checkformat
31+
32+
test-builds:
1233
name: ${{ matrix.name }}
1334
runs-on: ${{ matrix.os }}
1435
strategy:
1536
fail-fast: false
1637
matrix:
1738
include:
18-
- name: Lint
19-
os: ubuntu-latest
20-
pyversion: '3.7'
21-
dolint: 1
22-
- name: Linux py34
23-
os: ubuntu-latest
24-
pyversion: '3.6'
25-
tests: 1
39+
- name: Linux py35
40+
os: ubuntu-20.04
41+
pyversion: '3.5'
2642
- name: Linux py36
2743
os: ubuntu-latest
2844
pyversion: '3.6'
29-
tests: 1
3045
- name: Linux py37
3146
os: ubuntu-latest
3247
pyversion: '3.7'
33-
tests: 1
3448
- name: Linux py38
3549
os: ubuntu-latest
3650
pyversion: '3.8'
37-
tests: 1
3851
- name: Linux py39
3952
os: ubuntu-latest
4053
pyversion: '3.9'
41-
tests: 1
54+
- name: Linux py310
55+
os: ubuntu-latest
56+
pyversion: '3.10'
4257
- name: Linux pypy3
4358
os: ubuntu-latest
4459
pyversion: 'pypy3'
45-
tests: 1
46-
- name: Windows py38
60+
- name: Windows py39
4761
os: windows-latest
48-
pyversion: '3.8'
49-
tests: 1
50-
- name: MacOS py38
62+
pyversion: '3.9'
63+
- name: MacOS py39
5164
os: macos-latest
52-
pyversion: '3.8'
53-
tests: 1
54-
65+
pyversion: '3.9'
5566
steps:
56-
5767
- uses: actions/checkout@v2
5868
- name: Set up Python ${{ matrix.pyversion }}
5969
uses: actions/setup-python@v2
6070
with:
6171
python-version: ${{ matrix.pyversion }}
62-
63-
- name: Install dependencies (lint and docs)
64-
if: matrix.dolint == 1
65-
run: |
66-
python -m pip install --upgrade pip
67-
pip install invoke black flake8
68-
- name: Install dependencies (unit tests)
69-
if: matrix.tests == 1
72+
- name: Install dependencies
7073
run: |
7174
python -m pip install --upgrade pip
7275
pip install psutil
7376
pip install invoke pytest pytest-cov
7477
invoke get-ffmpeg-binary;
75-
76-
- name: Lint
77-
if: matrix.dolint == 1
78-
run: |
79-
invoke lint
80-
invoke checkformat
8178
- name: Test with pytest
82-
if: matrix.tests == 1
8379
run: |
8480
python -c "import sys; print(sys.version, '\n', sys.prefix)";
8581
python -c 'import imageio_ffmpeg; print(imageio_ffmpeg.get_ffmpeg_version())'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ and adds support for e.g. cameras and seeking.
2222

2323
## Installation
2424

25-
This library works with any version of Python 3.4+ (including Pypy).
25+
This library works with any version of Python 3.5+ (including Pypy).
2626
There are no further dependencies. The wheels on Pypi include the ffmpeg
2727
executable for all common platforms (Windows 7+, Linux kernel 2.6.32+,
2828
OSX 10.9+). Install using:

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
long_description=long_description,
5757
platforms="any",
5858
provides=["imageio_ffmpeg"],
59-
python_requires=">=3.4",
59+
python_requires=">=3.5",
6060
setup_requires=["pip>19"],
6161
install_requires=[],
6262
packages=["imageio_ffmpeg"],
@@ -75,11 +75,11 @@
7575
"Operating System :: POSIX",
7676
"Programming Language :: Python",
7777
"Programming Language :: Python :: 3",
78-
"Programming Language :: Python :: 3.4",
7978
"Programming Language :: Python :: 3.5",
8079
"Programming Language :: Python :: 3.6",
8180
"Programming Language :: Python :: 3.7",
8281
"Programming Language :: Python :: 3.8",
8382
"Programming Language :: Python :: 3.9",
83+
"Programming Language :: Python :: 3.10",
8484
],
8585
)

0 commit comments

Comments
 (0)