Skip to content

Commit

Permalink
Merge pull request #61 from mopidy/jodal/py39+ci
Browse files Browse the repository at this point in the history
Require Python 3.9+ and fix CI
  • Loading branch information
jodal committed Jun 21, 2023
2 parents 8cbb441 + 47425e5 commit 5306c46
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 27 deletions.
41 changes: 20 additions & 21 deletions .github/workflows/ci.yml
@@ -1,52 +1,51 @@
name: CI

on: [push, pull_request]
on:
pull_request:
push:
branches:
- main

jobs:
main:
strategy:
fail-fast: false
matrix:
include:
- name: "Test: Python 3.7"
python: "3.7"
tox: py37
- name: "Test: Python 3.8"
python: "3.8"
tox: py38
- name: "Test: Python 3.9"
python: "3.9"
tox: py39
- name: "Test: Python 3.10"
python: "3.10"
tox: py310
- name: "Test: Python 3.11"
python: "3.11"
tox: py311
coverage: true
- name: "Lint: check-manifest"
python: "3.9"
python: "3.11"
tox: check-manifest
- name: "Lint: flake8"
python: "3.9"
python: "3.11"
tox: flake8

name: ${{ matrix.name }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container: ghcr.io/mopidy/ci:latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
- uses: actions/checkout@v3
- name: Fix home dir permissions to enable pip caching
run: chown -R root /github/home
- name: Cache pip
uses: actions/cache@v2
- uses: actions/setup-python@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-${{ matrix.python }}-${{ matrix.tox }}-pip-${{ hashFiles('setup.cfg') }}-${{ hashFiles('tox.ini') }}
restore-keys: |
${{ runner.os }}-${{ matrix.python }}-${{ matrix.tox }}-pip-
python-version: ${{ matrix.python }}
cache: pip
cache-dependency-path: setup.cfg
- run: python -m pip install pygobject tox
- run: python -m tox -e ${{ matrix.tox }}
if: ${{ ! matrix.coverage }}
- run: python -m tox -e ${{ matrix.tox }} -- --cov-report=xml
if: ${{ matrix.coverage }}
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v3
if: ${{ matrix.coverage }}
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -6,7 +6,7 @@ Mopidy-MPD
:target: https://pypi.org/project/Mopidy-MPD/
:alt: Latest PyPI version

.. image:: https://img.shields.io/github/workflow/status/mopidy/mopidy-mpd/CI
.. image:: https://img.shields.io/github/actions/workflow/status/mopidy/mopidy-mpd/ci.yml?branch=main
:target: https://github.com/mopidy/mopidy-mpd/actions
:alt: CI build status

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Expand Up @@ -3,7 +3,7 @@ requires = ["setuptools >= 30.3.0", "wheel"]


[tool.black]
target-version = ["py37", "py38"]
target-version = ["py39", "py310", "py311"]
line-length = 80


Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Expand Up @@ -14,17 +14,17 @@ classifiers =
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
Programming Language :: Python :: 3
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
Topic :: Multimedia :: Sound/Audio :: Players


[options]
zip_safe = False
include_package_data = True
packages = find:
python_requires = >= 3.7
python_requires = >= 3.9
install_requires =
Mopidy >= 3.3.0
Pykka >= 2.0.1
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py37, py38, py39, check-manifest, flake8
envlist = py39, py310, py311, check-manifest, flake8

[testenv]
sitepackages = true
Expand Down

0 comments on commit 5306c46

Please sign in to comment.