Skip to content

Commit 2bc5102

Browse files
authored
Merge pull request #10 from mopidy/jodal/py39+ci
Require Python 3.9+ and fix CI
2 parents 6cfdd44 + 31c4ae6 commit 2bc5102

File tree

4 files changed

+35
-19
lines changed

4 files changed

+35
-19
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
48

59
jobs:
610
main:
@@ -9,34 +13,29 @@ jobs:
913
matrix:
1014
include:
1115
- name: "Lint: check-manifest"
12-
python: "3.9"
16+
python: "3.11"
1317
tox: check-manifest
1418
- name: "Lint: flake8"
15-
python: "3.9"
19+
python: "3.11"
1620
tox: flake8
1721

1822
name: ${{ matrix.name }}
19-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-22.04
2024
container: ghcr.io/mopidy/ci:latest
2125

2226
steps:
23-
- uses: actions/checkout@v2
24-
- uses: actions/setup-python@v2
25-
with:
26-
python-version: ${{ matrix.python }}
27+
- uses: actions/checkout@v3
2728
- name: Fix home dir permissions to enable pip caching
2829
run: chown -R root /github/home
29-
- name: Cache pip
30-
uses: actions/cache@v2
30+
- uses: actions/setup-python@v4
3131
with:
32-
path: ~/.cache/pip
33-
key: ${{ runner.os }}-${{ matrix.python }}-${{ matrix.tox }}-pip-${{ hashFiles('setup.cfg') }}-${{ hashFiles('tox.ini') }}
34-
restore-keys: |
35-
${{ runner.os }}-${{ matrix.python }}-${{ matrix.tox }}-pip-
32+
python-version: ${{ matrix.python }}
33+
cache: pip
34+
cache-dependency-path: setup.cfg
3635
- run: python -m pip install pygobject tox
3736
- run: python -m tox -e ${{ matrix.tox }}
3837
if: ${{ ! matrix.coverage }}
3938
- run: python -m tox -e ${{ matrix.tox }} -- --cov-report=xml
4039
if: ${{ matrix.coverage }}
41-
- uses: codecov/codecov-action@v1
40+
- uses: codecov/codecov-action@v3
4241
if: ${{ matrix.coverage }}

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mopidy-API-Explorer
66
:target: https://pypi.org/project/Mopidy-API-Explorer/
77
:alt: Latest PyPI version
88

9-
.. image:: https://img.shields.io/github/actions/workflow/status/mopidy/mopidy-api-explorer/ci.yml?branch=master
9+
.. image:: https://img.shields.io/github/actions/workflow/status/mopidy/mopidy-api-explorer/ci.yml?branch=main
1010
:target: https://github.com/mopidy/mopidy-api-explorer/actions
1111
:alt: CI build status
1212

pyproject.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
11
[build-system]
22
requires = ["setuptools >= 30.3.0", "wheel"]
3+
4+
5+
[tool.black]
6+
target-version = ["py39", "py310", "py311"]
7+
line-length = 80
8+
9+
10+
[tool.isort]
11+
multi_line_output = 3
12+
include_trailing_comma = true
13+
force_grid_wrap = 0
14+
use_parentheses = true
15+
line_length = 88
16+
known_tests = "tests"
17+
sections = "FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,TESTS,LOCALFOLDER"

setup.cfg

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@ classifiers =
1414
License :: OSI Approved :: MIT License
1515
Operating System :: OS Independent
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.7
18-
Programming Language :: Python :: 3.8
1917
Programming Language :: Python :: 3.9
18+
Programming Language :: Python :: 3.10
19+
Programming Language :: Python :: 3.11
20+
Topic :: Multimedia :: Sound/Audio :: Players
21+
2022

2123
[options]
2224
zip_safe = False
2325
include_package_data = True
2426
packages = find:
25-
python_requires = >= 3.7
27+
python_requires = >= 3.9
2628
install_requires =
2729
Mopidy >= 3.1.1
2830
setuptools

0 commit comments

Comments
 (0)