Merge branch 'master' into multiline-tags

Author: jsa34

.github/workflows/main.yml

@@ -88,3 +88,28 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: false
         verbose: true # optional (default = false)
+
+  pypi-publish:
+    name: Upload release to PyPI
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/pytest-bdd
+    permissions:
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    needs: test-run
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+      - name: Install pypa/build
+        run: >-
+          python3 -m
+          pip install
+          build
+          --user
+      - name: Build a binary wheel and a source tarball
+        run: python3 -m build
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

CHANGES.rst

@@ -3,7 +3,10 @@ Changelog
 
 Unreleased
 ----------
-- Use `gherkin-official` parser to replace custom parsing logic.
+
+8.0.0b1
+----------
+- Use `gherkin-official` parser to replace custom parsing logic. This will make pytest-bdd more compatible with the Gherkin specification.
 - Multiline steps must now always use triple-quotes for the additional lines.
 - All feature files must now use the keyword `Feature:` to be considered valid.
 - Tags can no longer have spaces (e.g. "@tag one" "@tag two" are no longer valid).

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest-bdd"
-version = "7.3.0"
+version = "8.0.0b1"
 description = "BDD for pytest"
 authors = ["Oleg Pidsadnyi <[email protected]>", "Anatoly Bubenkov <[email protected]>"]
 maintainers = ["Alessio Bogon <[email protected]>"]

tests/feature/test_steps.py

@@ -620,3 +620,36 @@ def _(stuff):
             "*Tearing down...*",
         ]
     )
+
+
+def test_right_aligned_steps(pytester):
+    """Parser correctly handles steps that are not left-aligned"""
+    pytester.makefile(
+        ".feature",
+        right_aligned_steps="""\
+Feature: Non-standard step indentation
+    Scenario: Indent my steps
+        Given I indent with 4 spaces
+         Then I indent with 5 spaces to line up
+         """,
+    )
+    pytester.makepyfile(
+        textwrap.dedent(
+            """\
+        from pytest_bdd import given, then, scenarios
+
+        scenarios("right_aligned_steps.feature")
+
+        @given("I indent with 4 spaces")
+        def _():
+            pass
+
+        @then("I indent with 5 spaces to line up")
+        def _():
+            pass
+
+        """
+        )
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(passed=1, failed=0)