Decouple merging of --python with nox.options from --sessions and --keywords #359
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
How do you feel about adding a test case to cover this? (Also I merged the base PR, can you rebase?) |
The noxfile.py is templated with the default session (`nox.options.sessions`), and the default Python version (`nox.options.pythons`), as well as an alternate Python version. This allows us to avoid the situation where a test case running on one Python version needs to launch Nox using another Python version. As a side-effect, it makes the test cases a bit more explicit.
Revert function name to the one used before --pythons was introduced.
cjolowicz
force-pushed
the
fix-python-session-coupling
branch
from
4a0bfbc
to
682705c
Compare
|
@theacodes Added tests and rebased. The tests use a fixture to generate noxfile.py from a template with a default session ( |
|
Thank you! |
|
Thank you for reviewing and merging this @theacodes 🙂 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #358
This PR is a follow-up to #357, and contains the following additional changes:
1. Do not ignore nox.options.pythons when --{sessions,keywords} passed
Declare the
--pythonoption without a custom merge function, i.e. omit themerge_funcparameter. As a result,nox.options.pythonswill no longer be ignored when--sessionsor--keywordsare passed.2. Do not ignore nox.options.{sessions,keywords} when --pythons passed
Revert
_session_filters_merge_functo the state before--pythonswas introduced. This means that it will only check if--sessionsor--keywordswere specified on the command-line. As a result, thenox.options.sessionsandnox.options.keywordssettings will no longer be ignored when--pythonsis passed.