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

Make py2 and py3 aliases also resolve via py on windows #858

Merged
merged 1 commit into from
Jun 25, 2018
Merged

Make py2 and py3 aliases also resolve via py on windows #858

merged 1 commit into from
Jun 25, 2018

Conversation

asottile
Copy link
Contributor

Resolves #856

CC @pfmoore

@gaborbernat
Copy link
Member

Take a look at the ci as it broke on UNIX.

@asottile
Copy link
Contributor Author

heh, this was passing for the wrong reason before (the assertion succeeded because the exit code of check_call was never verified) -- I guess I can add a similar -c '' check for unix as well

@codecov
Copy link

codecov bot commented Jun 23, 2018

Codecov Report

Merging #858 into master will increase coverage by <1%.
The diff coverage is 100%.

@@          Coverage Diff           @@
##           master   #858    +/-   ##
======================================
+ Coverage      92%    92%   +<1%     
======================================
  Files          13     13            
  Lines        2421   2421            
  Branches      430    430            
======================================
+ Hits         2221   2224     +3     
+ Misses        124    123     -1     
+ Partials       76     74     -2

@asottile
Copy link
Contributor Author

@gaborbernat should be reviewable now!

@gaborbernat
Copy link
Member

gaborbernat commented Jun 24, 2018

@asottile py2 and py3 work as aliases for the basepython property, not? If that's the case we should document this under the basepython config.
Furthermore, I'm not sure if this is what we want, as this would make our config not cross-platform. I mean when will I pass in py2?

Or is this only so that I can do tox -e py2 which will pick up whatever python 2 I have on windows and run the default testenv?

@asottile
Copy link
Contributor Author

This enables the following things:

  • tox -e py2 + tox -e py3 to work on windows (they already work on posix)
  • basepython=python2 / basepython=python3 to work on windows (they already work on posix, and basepython=pythonX.X already works on windows)

This does not enable anything (imo) nonstandard like basepython=py2

@gaborbernat gaborbernat merged commit dbbeb67 into tox-dev:master Jun 25, 2018
@pfmoore
Copy link

pfmoore commented Jun 25, 2018

Thanks for this! Sorry I didn't have time to test it - you guys are to fast for me 😄

@gaborbernat
Copy link
Member

We plan to do a release with 3.1 next week together with #852. If you find any issues with that feel free to come back and fill a bug.

@gaborbernat gaborbernat added this to the 3.1 milestone Jun 25, 2018
gaborbernat added a commit that referenced this pull request Jun 26, 2018
- print link to where documentation is generated
- remove old documentation css
- configure alabaster to display Github stars/Travis CI, and fork me badge
- allow the documentation to span up to 1280 pixels, instead of 800 (this allows many code examples to be much more readable, or changelog entries)
- remove large spaces in between changelog entries for a more compact view
- version strings are italic and bold for a cleaner delimitation inside the changelog
- sections in a version changelog has a smaller top margin for a more compact view
- automatically render news at top of the documentation under DRAFT section, this allows testing the news fragment before release
- remove double header for changelog 
- use the ``:user:`` extlinks for changelog entries to link to contributors
Github profile
- improve changelog entry for issue #858
- add a config file for readthedocs

see example output at https://tox-gaborbernat.readthedocs.io/en/doc-impr (or deep dive http://tox-gaborbernat.readthedocs.io/en/doc-impr/changelog.html)
@asottile asottile deleted the py2_py3_windows branch July 10, 2018 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants