Skip to content

rename TOX_CONFIG_FILE to TOX_USER_CONFIG_FILE#2896

Merged
gaborbernat merged 3 commits intotox-dev:mainfrom
masenf:user-config-file
Jan 25, 2023
Merged

rename TOX_CONFIG_FILE to TOX_USER_CONFIG_FILE#2896
gaborbernat merged 3 commits intotox-dev:mainfrom
masenf:user-config-file

Conversation

@masenf
Copy link
Copy Markdown
Contributor

@masenf masenf commented Jan 25, 2023

Allow overriding the user config file without overriding the main config file.

Fix #2890

TODO

  • Fixup tests

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

Allow overriding the user config file without overriding the main config file.

Fix tox-dev#2890
@masenf masenf requested a review from gaborbernat as a code owner January 25, 2023 19:00
@masenf masenf marked this pull request as draft January 25, 2023 19:08
in these cases, the user config does NOT overwrite the main config, so
`assert options["config_file"] is None`
@gaborbernat gaborbernat marked this pull request as ready for review January 25, 2023 20:37
@gaborbernat gaborbernat merged commit ed39bd7 into tox-dev:main Jan 25, 2023
descope bot referenced this pull request in descope/django-descope Feb 9, 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.4.0` -> `4.4.2` | `4.4.5` (+2) |

---

### Release Notes

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

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

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

#### What's Changed

- rename TOX_CONFIG_FILE to TOX_USER_CONFIG_FILE by
[@&#8203;masenf](https://togithub.com/masenf) in
[https://github.com/tox-dev/tox/pull/2896](https://togithub.com/tox-dev/tox/pull/2896)

**Full Changelog**: tox-dev/tox@4.4.1...4.4.2

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

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

#### What's Changed

- pip_install: constrain_package_deps is now False by default by
[@&#8203;masenf](https://togithub.com/masenf) in
[https://github.com/tox-dev/tox/pull/2899](https://togithub.com/tox-dev/tox/pull/2899)

**Full Changelog**: tox-dev/tox@4.4.0...4.4.1

</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:eyJjcmVhdGVkSW5WZXIiOiIzNC4xMDEuMCIsInVwZGF0ZWRJblZlciI6IjM0LjEwMS4wIn0=-->

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_CONFIG_FILE overrides local config

2 participants