Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require space after colon before factor expansion #2822

Merged
merged 5 commits into from Jan 5, 2023

Conversation

pdecat
Copy link
Contributor

@pdecat pdecat commented Jan 4, 2023

Thanks for contribution

Please, make sure you address all the checklists (for details on how see
development documentation)!

  • ran the linter to address style issues (tox -e fix)
  • wrote descriptive pull request text
  • ensured there are test(s) validating the fix
  • added news fragment in docs/changelog folder
  • updated/extended the documentation

Resolves #2821, and probably also #2817

@pdecat
Copy link
Contributor Author

pdecat commented Jan 4, 2023

Confirmed this change fixes #2821.

Now, there are other unit tests to adapt. On it...

@gaborbernat gaborbernat merged commit 497c17c into tox-dev:main Jan 5, 2023
@pdecat pdecat deleted the require_space_factor_filter branch January 5, 2023 06:41
@@ -50,7 +50,7 @@ def expand_factors(value: str) -> Iterator[tuple[list[list[tuple[str, bool]]] |
for line in value.split("\n"):
factors: list[list[tuple[str, bool]]] | None = None
marker_at, content = line.find(":"), line
if marker_at != -1:
if marker_at != -1 and (len(line) == marker_at + 1 or line[marker_at + 1] == " "):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gaborbernat Should tabs be accepted too?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Submitted #2823

descope bot added a commit to descope/django-descope that referenced this pull request Jan 19, 2023
This PR contains the following updates:

| Package | Type | Update | Change | Pending |
|---|---|---|---|---|
| [tox](https://togithub.com/tox-dev/tox)
([changelog](https://tox.wiki/en/latest/changelog.html)) | dev | patch |
`4.2.2` -> `4.2.3` | `4.3.5` (+10) |

---

### Release Notes

<details>
<summary>tox-dev/tox</summary>

### [`v4.2.3`](https://togithub.com/tox-dev/tox/releases/tag/4.2.3)

[Compare Source](https://togithub.com/tox-dev/tox/compare/4.2.2...4.2.3)

#### What's Changed

- Require space after colon before factor expansion by
[@&#8203;pdecat](https://togithub.com/pdecat) in
[tox-dev/tox#2822
- Fix devenv when package for env is wheel/editable by
[@&#8203;gaborbernat](https://togithub.com/gaborbernat) in
[tox-dev/tox#2820

**Full Changelog**: tox-dev/tox@4.2.2...4.2.3

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC45OS4yIiwidXBkYXRlZEluVmVyIjoiMzQuOTkuMiJ9-->

Co-authored-by: descope[bot] <descope[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tox-docker configuration parsing broken since tox 4.0.13
2 participants