Drop python 3.8, add support for 3.12, 3.13 (#842)
* Drop python 3.8, add support for 3.12, 3.13 --------- Co-authored-by: Jim Brännlund <jim.brannlund@gmail.com>
This commit is contained in:
parent
f2da5e6300
commit
cc5e0194aa
|
@ -22,7 +22,7 @@ jobs:
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.10'
|
python-version: '3.x'
|
||||||
|
|
||||||
- name: Ensure latest pip
|
- name: Ensure latest pip
|
||||||
run: python -m pip install --upgrade pip
|
run: python -m pip install --upgrade pip
|
||||||
|
@ -87,20 +87,20 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, windows-latest, macos-latest]
|
os: [ubuntu-latest, windows-latest, macos-latest]
|
||||||
python-version: ["3.8", "3.9", "3.10", "pypy3.9"]
|
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9"]
|
||||||
include:
|
include:
|
||||||
- os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
python-version: "3.10"
|
python-version: "3.10"
|
||||||
with-coverage: true
|
with-coverage: true
|
||||||
|
|
||||||
- os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
python-version: 3.11-dev
|
python-version: 3.13
|
||||||
tox-env: devel
|
tox-env: devel
|
||||||
- os: windows-latest
|
- os: windows-latest
|
||||||
python-version: 3.11-dev
|
python-version: 3.13
|
||||||
tox-env: devel
|
tox-env: devel
|
||||||
- os: macos-latest
|
- os: macos-latest
|
||||||
python-version: 3.11-dev
|
python-version: 3.13
|
||||||
tox-env: devel
|
tox-env: devel
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -163,11 +163,11 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["3.8", "3.9", "3.10", "pypy3.9"]
|
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9"]
|
||||||
include:
|
include:
|
||||||
- python-version: "3.10"
|
- python-version: "3.10"
|
||||||
with-coverage: true
|
with-coverage: true
|
||||||
- python-version: 3.11-dev
|
- python-version: 3.13
|
||||||
tox-env: devel
|
tox-env: devel
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -233,9 +233,9 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["3.8", "3.9", "3.10", "pypy3.9"]
|
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9"]
|
||||||
include:
|
include:
|
||||||
- python-version: 3.11-dev
|
- python-version: 3.13
|
||||||
tox-env: devel
|
tox-env: devel
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -10,7 +10,7 @@ name = "pytest-html"
|
||||||
description = "pytest plugin for generating HTML reports"
|
description = "pytest plugin for generating HTML reports"
|
||||||
readme = "README.rst"
|
readme = "README.rst"
|
||||||
license = "MPL-2.0"
|
license = "MPL-2.0"
|
||||||
requires-python = ">=3.8"
|
requires-python = ">=3.9"
|
||||||
keywords = [
|
keywords = [
|
||||||
"pytest",
|
"pytest",
|
||||||
"html",
|
"html",
|
||||||
|
@ -29,10 +29,11 @@ classifiers = [
|
||||||
"Operating System :: POSIX",
|
"Operating System :: POSIX",
|
||||||
"Operating System :: Microsoft :: Windows",
|
"Operating System :: Microsoft :: Windows",
|
||||||
"Operating System :: MacOS :: MacOS X",
|
"Operating System :: MacOS :: MacOS X",
|
||||||
"Programming Language :: Python :: 3.8",
|
|
||||||
"Programming Language :: Python :: 3.9",
|
"Programming Language :: Python :: 3.9",
|
||||||
"Programming Language :: Python :: 3.10",
|
"Programming Language :: Python :: 3.10",
|
||||||
"Programming Language :: Python :: 3.11",
|
"Programming Language :: Python :: 3.11",
|
||||||
|
"Programming Language :: Python :: 3.12",
|
||||||
|
"Programming Language :: Python :: 3.13",
|
||||||
"Programming Language :: Python :: Implementation :: CPython",
|
"Programming Language :: Python :: Implementation :: CPython",
|
||||||
"Programming Language :: Python :: Implementation :: PyPy",
|
"Programming Language :: Python :: Implementation :: PyPy",
|
||||||
"Topic :: Software Development :: Quality Assurance",
|
"Topic :: Software Development :: Quality Assurance",
|
||||||
|
|
4
start
4
start
|
@ -7,7 +7,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${1}" == "down" ]]; then
|
if [[ "${1}" == "down" ]]; then
|
||||||
docker-compose -f <(sed -e "s;%%VOLUME%%;${volume};g" docker-compose.tmpl.yml) down
|
docker compose -f <(sed -e "s;%%VOLUME%%;${volume};g" docker-compose.tmpl.yml) down
|
||||||
else
|
else
|
||||||
docker-compose -f <(sed -e "s;%%VOLUME%%;${volume};g" docker-compose.tmpl.yml) up -d
|
docker compose -f <(sed -e "s;%%VOLUME%%;${volume};g" docker-compose.tmpl.yml) up -d
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
import importlib.resources
|
import importlib.resources
|
||||||
import os
|
|
||||||
import sys
|
import sys
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
import pkg_resources
|
|
||||||
import pytest
|
import pytest
|
||||||
from assertpy import assert_that
|
from assertpy import assert_that
|
||||||
|
|
||||||
|
@ -17,19 +15,13 @@ def run(pytester, path="report.html", cmd_flags=None):
|
||||||
|
|
||||||
|
|
||||||
def file_content():
|
def file_content():
|
||||||
try:
|
return (
|
||||||
return (
|
importlib.resources.files("pytest_html")
|
||||||
importlib.resources.files("pytest_html")
|
.joinpath("assets", "style.css")
|
||||||
.joinpath("assets", "style.css")
|
.read_bytes()
|
||||||
.read_bytes()
|
.decode("utf-8")
|
||||||
.decode("utf-8")
|
.strip()
|
||||||
.strip()
|
)
|
||||||
)
|
|
||||||
except AttributeError:
|
|
||||||
# Needed for python < 3.9
|
|
||||||
return pkg_resources.resource_string(
|
|
||||||
"pytest_html", os.path.join("assets", "style.css")
|
|
||||||
).decode("utf-8")
|
|
||||||
|
|
||||||
|
|
||||||
def test_duration_format_deprecation_warning(pytester):
|
def test_duration_format_deprecation_warning(pytester):
|
||||||
|
|
6
tox.ini
6
tox.ini
|
@ -4,7 +4,7 @@
|
||||||
# and then run "tox" from this directory.
|
# and then run "tox" from this directory.
|
||||||
|
|
||||||
[tox]
|
[tox]
|
||||||
envlist = {3.8, 3.9, 3.10, 3.10-cov, pypy3.9}, docs, linting
|
envlist = {3.9, 3.10, 3.10-cov, 3.11, 3.12, 3.13, pypy3.9}, docs, linting
|
||||||
isolated_build = True
|
isolated_build = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
@ -56,7 +56,3 @@ extend-ignore = E203
|
||||||
|
|
||||||
[pytest]
|
[pytest]
|
||||||
testpaths = testing
|
testpaths = testing
|
||||||
# TODO: Temporary hack until they fix
|
|
||||||
# https://github.com/pytest-dev/pytest/issues/6936
|
|
||||||
filterwarnings =
|
|
||||||
ignore:.*TerminalReporter.writer attribute is deprecated.*:pytest.PytestDeprecationWarning
|
|
||||||
|
|
Loading…
Reference in New Issue