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

Do not modify provisioned envdir when --devenv is specified #2066

Merged
merged 4 commits into from May 24, 2021

Conversation

isaac-ped
Copy link

@isaac-ped isaac-ped commented May 20, 2021

This change prevents --devenv from changing the envdir for the .tox environment

Fixes #2065

  • wrote descriptive pull request text
  • added/updated test(s)
  • updated/extended the documentation
  • added relevant issue keyword
    in message body
  • added news fragment in changelog folder
    • fragment name: <issue number>.<type>.rst for example (588.bugfix.rst)
    • <type> is must be one of bugfix, feature, deprecation,breaking, doc, misc
    • if PR has no issue: consider creating one first or change it to the PR number after creating the PR
    • "sign" fragment with "by :user:<your username>"
    • please use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files - by :user:superuser."
    • also see examples
  • added yourself to CONTRIBUTORS (preserving alphabetical order)

@jugmac00
Copy link
Member

I had no chance to look closer, but anyway, could you please add a changelog entry? Thank you.

src/tox/config/__init__.py Outdated Show resolved Hide resolved
@isaac-ped
Copy link
Author

I had no chance to look closer, but anyway, could you please add a changelog entry? Thank you.

I was unsure if it was intensional for my changelog file to be the only one in that directory, and didn't realize that was the cause of the Timeline protection failure. Given that it fixed the failing CI, I'm guessing that was indeed the correct location for it.

@jugmac00
Copy link
Member

I had no chance to look closer, but anyway, could you please add a changelog entry? Thank you.

I was unsure if it was intensional for my changelog file to be the only one in that directory, and didn't realize that was the cause of the Timeline protection failure. Given that it fixed the failing CI, I'm guessing that was indeed the correct location for it.

Yes, you are absolutely right. We use https://pypi.org/project/towncrier/ for changelogs. One of the great advantages is, that there are no merge conflicts because of the change log, as the changelog is only built when there is a new release. Compare this to the situtation, when e.g. 10 pull requests are open - as soon as the first one gets merged, all the others would have to rebase over and over again.

Copy link
Member

@gaborbernat gaborbernat left a comment

Choose a reason for hiding this comment

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

@gaborbernat gaborbernat merged commit 2a2a964 into tox-dev:master May 24, 2021
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.

--devenv fails because root .tox environment is provisioned in identical envdir
3 participants