Skip to content

Commit

Permalink
Merge branch 'master' into parser_performance
Browse files Browse the repository at this point in the history
  • Loading branch information
youtux authored Jul 23, 2023
2 parents 86b6c94 + 73c2393 commit c52a5fa
Show file tree
Hide file tree
Showing 7 changed files with 170 additions and 250 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ jobs:
strategy:
matrix:
include:
- python-version: "3.7"
toxfactor: py37
ignore-typecheck-outcome: true
ignore-test-outcome: false
- python-version: "3.8"
toxfactor: py38
ignore-typecheck-outcome: true
Expand All @@ -31,7 +27,7 @@ jobs:
toxfactor: py311
ignore-typecheck-outcome: true
ignore-test-outcome: false
- python-version: "3.12.0-alpha.3"
- python-version: "3.12-dev"
toxfactor: py312
ignore-typecheck-outcome: true
ignore-test-outcome: true
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
rev: v3.3.1
hooks:
- id: pyupgrade
args: ["--py37-plus"]
args: ["--py38-plus"]
# TODO: Enable mypy checker when the checks succeed
#- repo: https://github.com/pre-commit/mirrors-mypy
# rev: v0.931
Expand Down
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Changelog

Unreleased
----------
- Drop python 3.7 compatibility, as it's no longer supported. `#627 <https://github.com/pytest-dev/pytest-bdd/pull/627>`_
- ⚠️ Backwards incompatible: - ``parsers.re`` now does a `fullmatch <https://docs.python.org/3/library/re.html#re.fullmatch>`_ instead of a partial match. This is to make it work just like the other parsers, since they don't ignore non-matching characters at the end of the string. `#539 <https://github.com/pytest-dev/pytest-bdd/pull/539>`_
- Add support for Scenarios and Scenario Outlines to have descriptions. `#600 <https://github.com/pytest-dev/pytest-bdd/pull/600>`_

Expand Down
399 changes: 162 additions & 237 deletions poetry.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ classifiers = [
"Topic :: Software Development :: Libraries",
"Topic :: Utilities",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand All @@ -34,7 +33,7 @@ classifiers = [
"pytest-bdd" = "pytest_bdd.scripts:main"

[tool.poetry.dependencies]
python = "^3.7"
python = ">=3.8"
Mako = "*"
parse = "*"
parse-type = "*"
Expand All @@ -55,7 +54,7 @@ build-backend = "poetry.core.masonry.api"

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

[tool.isort]
profile = "black"
Expand Down Expand Up @@ -87,7 +86,7 @@ source = [


[tool.mypy]
python_version = "3.7"
python_version = "3.8"
warn_return_any = true
warn_unused_configs = true
files = "src/pytest_bdd/**/*.py"
Expand Down
3 changes: 1 addition & 2 deletions src/pytest_bdd/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,10 @@ def _(article):
import enum
from dataclasses import dataclass, field
from itertools import count
from typing import Any, Callable, Iterable, TypeVar
from typing import Any, Callable, Iterable, Literal, TypeVar

import pytest
from _pytest.fixtures import FixtureDef, FixtureRequest
from typing_extensions import Literal

from .parser import Step
from .parsers import StepParser, get_parser
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
distshare = {homedir}/.tox/distshare
envlist = py{37,38,39,310,311,312}-pytest{62,70,71,72,latest}-coverage
envlist = py{38,39,310,311,312}-pytest{62,70,71,72,latest}-coverage
py311-pytestlatest-xdist-coverage
mypy

Expand Down

0 comments on commit c52a5fa

Please sign in to comment.