Skip to content

Commit

Permalink
Merge pull request #38 from freakboy3742/dependabot/github_actions/do…
Browse files Browse the repository at this point in the history
…t-github/workflows/actions/download-artifact-4.1.7

Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows
  • Loading branch information
freakboy3742 authored Sep 4, 2024
2 parents 60eb7e4 + c71f6d9 commit a987938
Show file tree
Hide file tree
Showing 15 changed files with 126 additions and 127 deletions.
40 changes: 26 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
branches:
- main

env:
python_version: '3.9'

jobs:
pre-commit:
name: Pre-commit code style checks
Expand All @@ -17,9 +14,9 @@ jobs:
- name: Check out code
uses: actions/checkout@v3.1.0
- name: Set up Python
uses: actions/setup-python@v4.3.0
uses: actions/setup-python@v5.1.1
with:
python-version: ${{ env.python_version }}
python-version: "3.X"
- name: Lint with Pre-commit
uses: pre-commit/action@v3.0.0

Expand All @@ -38,9 +35,9 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4.3.0
uses: actions/setup-python@v5.1.1
with:
python-version: ${{ env.python_version }}
python-version: "3.X"
- name: Install dependencies
run: |
pip install tox
Expand All @@ -57,17 +54,17 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4.3.0
uses: actions/setup-python@v5.1.1
with:
python-version: ${{ env.python_version }}
python-version: "3.X"
- name: Install dependencies
run: |
python -m pip install tox
- name: Build packages
run: |
tox -e package
- name: Upload packages as artefacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.6
with:
name: packages
path: dist
Expand All @@ -78,8 +75,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
pytest-version: ["3", "4", "5", "6", "7"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13-dev"]
pytest-version: ["3", "4", "5", "6", "7", "8"]

exclude:
# PyTest <=5 doesn't work on Python >= 3.10
Expand All @@ -96,6 +93,21 @@ jobs:
pytest-version: "4"
- python-version: "3.11"
pytest-version: "5"

- python-version: "3.12"
pytest-version: "3"
- python-version: "3.12"
pytest-version: "4"
- python-version: "3.12"
pytest-version: "5"

- python-version: "3.13-dev"
pytest-version: "3"
- python-version: "3.13-dev"
pytest-version: "4"
- python-version: "3.13-dev"
pytest-version: "5"

steps:
- name: Check out code
uses: actions/checkout@v3.1.0
Expand All @@ -104,7 +116,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Get packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.7
with:
name: packages
path: dist
Expand All @@ -113,5 +125,5 @@ jobs:
python -m pip install tox
- name: Test
run: |
export PY_VERSION=${{ matrix.python-version }}
export PY_VERSION=$(cut -d- -f1 <<< ${{ matrix.python-version }})
tox -e py${PY_VERSION/./}-pytest${{ matrix.pytest-version }} --installpkg dist/*.whl
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
release_name: ${{ github.ref }}
draft: true
prerelease: false
17 changes: 8 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.6.0
hooks:
- id: check-toml
- id: check-yaml
Expand All @@ -9,27 +9,26 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
rev: 5.13.2
hooks:
- id: isort
additional_dependencies: [toml]
- repo: https://github.com/asottile/pyupgrade
rev: v2.38.2
rev: v3.17.0
hooks:
- id: pyupgrade
args: [--py37-plus]
args: [--py38-plus]
- repo: https://github.com/myint/docformatter
rev: v1.5.0
rev: v1.7.5
hooks:
- id: docformatter
args: [--in-place]
- repo: https://github.com/psf/black
rev: 22.8.0
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 24.8.0
hooks:
- id: black
language_version: python3
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
rev: 7.1.1
hooks:
- id: flake8
additional_dependencies: [flake8-eradicate==1.4.0]
10 changes: 0 additions & 10 deletions MANIFEST.in

This file was deleted.

1 change: 1 addition & 0 deletions changes/38.feature.1.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Project metadata was updated to use PEP 621 format.
1 change: 1 addition & 0 deletions changes/38.feature.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support for Python 3.12 was added.
1 change: 1 addition & 0 deletions changes/38.feature.3.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support for Python 3.13 was added
1 change: 1 addition & 0 deletions changes/38.feature.4.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support for Pytest 8 was added
1 change: 1 addition & 0 deletions changes/38.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Pre-commit hooks and CI was updated.
1 change: 1 addition & 0 deletions changes/38.removal.1.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support for Python 3.7 was dropped.
1 change: 1 addition & 0 deletions changes/38.removal.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Support for Python 3.8 was dropped.
64 changes: 62 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,62 @@
[build-system]
requires = [
"setuptools >= 43.0.0",
"wheel >= 0.32.0",
"setuptools==73.0.1",
]
build-backend = "setuptools.build_meta"

[project]
dynamic = ["version"]
name = "pytest-tldr"
description = "A pytest plugin that limits the output to just the things you need."
license.file = "LICENSE"
readme = "README.rst"
requires-python = ">= 3.9"
authors = [
{name="Russell Keith-Magee", email="russell@keith-magee.com"},
]
maintainers = [
{name="Russell Keith-Magee", email="russell@keith-magee.com"},
]
keywords = [
"pytest"
]
classifiers = [
"Development Status :: 4 - Beta",
"Framework :: Pytest",
"Intended Audience :: Developers",
"Topic :: Software Development :: Testing",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Operating System :: OS Independent",
"License :: OSI Approved :: BSD License",
]
dependencies = [
"pytest >= 3.5.0"
]

[project.entry-points."pytest11"]
tldr = "pytest_tldr"

[project.urls]
Funding = "https://beeware.org/contributing/membership/"
# Documentation = "https://pytest-tldr.readthedocs.io/"
Tracker = "https://github.com/freakboy3742/pytest-tldr/issues"
Source = "https://github.com/freakboy3742/pytest-tldr"

[tool.setuptools]
py-modules = ["pytest_tldr"]

[tool.setuptools.dynamic]
version = {attr="pytest_tldr.__version__"}

[tool.isort]
profile = "black"
skip_glob = [
Expand All @@ -20,3 +72,11 @@ package = "pytest_tldr"
filename = "CHANGELOG.rst"
title_format = "{version} ({project_date})"
template = "changes/template.rst"
issue_format = "`#{issue} <https://github.com/beeware/briefcase/issues/{issue}>`__"
type = [
{ directory = "feature", name = "Features", showcontent = true },
{ directory = "bugfix", name = "Bugfixes", showcontent = true },
{ directory = "removal", name = "Backward Incompatible Changes", showcontent = true },
{ directory = "doc", name = "Documentation", showcontent = true },
{ directory = "misc", name = "Misc", showcontent = false },
]
70 changes: 0 additions & 70 deletions setup.cfg

This file was deleted.

4 changes: 0 additions & 4 deletions setup.py

This file was deleted.

Loading

0 comments on commit a987938

Please sign in to comment.