[issue27593] Deprecate sys._mercurial and create sys._git

STINNER Victor added the comment: > I think that covers it! Cool, good job ;-) -- ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

STINNER Victor added the comment: New changeset fd6c8bb89e834898c26620c9ab9afc6aaecb6b28 by Victor Stinner in branch '2.7': bpo-27593: Revise git SCM build info. (#744) (#746) (#1392) https://github.com/python/cpython/commit/fd6c8bb89e834898c26620c9ab9afc6aaecb6b28 --

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: I think that covers it! -- resolution: -> fixed stage: patch review -> resolved status: open -> closed ___ Python tracker

[issue27593] Deprecate sys._mercurial and create sys._git

STINNER Victor added the comment: With https://github.com/python/cpython/pull/1392 Python 2.7 should up to date with Python master, and this issue should be fixed. Or did I miss something? -- ___ Python tracker

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by STINNER Victor : -- pull_requests: +1499 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

STINNER Victor added the comment: New changeset 2c7085fd7b00cba8b5ab258c62453b6a12418b73 by Victor Stinner in branch '2.7': bpo-27593: Get SCM build info from git instead of hg (#1327) https://github.com/python/cpython/commit/2c7085fd7b00cba8b5ab258c62453b6a12418b73 --

[issue27593] Deprecate sys._mercurial and create sys._git

STINNER Victor added the comment: Ned Deily: "I'll be doing backports to 2.7 for this and some other things shortly." It seems like Ned was busy or forgot 2.7, so I wrote a change: https://github.com/python/cpython/pull/1327 My change doesn't touch platform.py. platform._sys_version() uses

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by STINNER Victor : -- pull_requests: +1438 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Serhiy Storchaka : -- pull_requests: -971 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Donald Stufft : -- pull_requests: +971 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: I'll be doing backports to 2.7 for this and some other things shortly. -- ___ Python tracker ___

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: It needs to be backported there too, or we need to unmigrate 2.7 back to mercurial. Otherwise we can't make a release. -- ___ Python tracker

[issue27593] Deprecate sys._mercurial and create sys._git

STINNER Victor added the comment: The 3.5, 3.6 and master branches of Python have a new sys._git attribute and lost their sys._mercurial attribute. But the 2.7 branch is still stuck at sys._mercurial: version and tag are empty. Should we backport sys._git from master to 2.7 and remove

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: New changeset 5c4b0d063aba0a68c325073f5f312a2c9f40d178 by Ned Deily in branch 'master': bpo-27593: Get SCM build info from git instead of hg. (#446) https://github.com/python/cpython/commit/5c4b0d063aba0a68c325073f5f312a2c9f40d178 --

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: New changeset a0c07d2edd345d2867f97ac31822c9544f9cbcf0 by Steve Dower in branch 'master': bpo-27593: Updates Windows build to use information from git (#262) https://github.com/python/cpython/commit/a0c07d2edd345d2867f97ac31822c9544f9cbcf0 --

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: New changeset cf445f10560483d38485204cf46ff1d0adcb4192 by Steve Dower in branch '3.5': bpo-27593: Updates Windows build to use information from git (#262) (#449) https://github.com/python/cpython/commit/cf445f10560483d38485204cf46ff1d0adcb4192 --

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: New changeset d3e1e9df724d97ab83113c2d5fa15179d1dcd560 by Steve Dower in branch '3.6': bpo-27593: Updates Windows build to use information from git (#262) (#450) https://github.com/python/cpython/commit/d3e1e9df724d97ab83113c2d5fa15179d1dcd560 --

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: New changeset 95c50e5aed9e5683676e18349dd94b11901a66b3 by Ned Deily in branch '3.6': [3.6] bpo-27593: Get SCM build info from git instead of hg. (#446) (#454) https://github.com/python/cpython/commit/95c50e5aed9e5683676e18349dd94b11901a66b3 --

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: New changeset a2edd3ae4074952ce77d9319da2dbb2a47300c27 by Ned Deily in branch '3.5': [3.5] bpo-27593: Get SCM build info from git instead of hg. (#446) (#454) (#455) https://github.com/python/cpython/commit/a2edd3ae4074952ce77d9319da2dbb2a47300c27 --

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: New changeset 6120484e46886fbc798c85a523bfe196faa1f60f by Steve Dower in branch '2.7': bpo-27593: Updates Windows build to use information from git (#262) (#448) https://github.com/python/cpython/commit/6120484e46886fbc798c85a523bfe196faa1f60f --

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: New changeset ed512cba78af211da4d83cbb7cc533c39176f374 by Ned Deily in branch '3.5': bpo-27593: Revise git SCM build info. (#744) (#746) https://github.com/python/cpython/commit/ed512cba78af211da4d83cbb7cc533c39176f374 --

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: New changeset 554626ada769abf82a5dabe6966afa4265acb6a6 by Ned Deily in branch 'master': bpo-27593: Revise git SCM build info. (#744) https://github.com/python/cpython/commit/554626ada769abf82a5dabe6966afa4265acb6a6 --

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: New changeset e9213d929d7b0075539e87416f6a6fb86c27454b by Ned Deily in branch '3.6': bpo-27593: Revise git SCM build info. (#744) (#745) https://github.com/python/cpython/commit/e9213d929d7b0075539e87416f6a6fb86c27454b --

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: New changeset 8c18fbeed1c7721b67f1726a6e9c41acef823135 by Ned Deily in branch '3.6': bpo-27593: Revise git SCM build info. (#744) (#745) https://github.com/python/cpython/commit/8c18fbeed1c7721b67f1726a6e9c41acef823135 --

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: The output LGTM. -- ___ Python tracker ___ ___ Python-bugs-list mailing list

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: Based on Brett's and Steve's feedback, I've pushed some tweaks to the captured git info. With the changes, we now use --short form of git hash. And we use output from "git describe --all --always --dirty" for the tag. I added --all and --always for better

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Ned Deily : -- pull_requests: +660 ___ Python tracker ___ ___ Python-bugs-list

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Ned Deily : -- pull_requests: +659 ___ Python tracker ___ ___ Python-bugs-list

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Ned Deily : -- pull_requests: +658 ___ Python tracker ___ ___ Python-bugs-list

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Larry Hastings : -- pull_requests: -578 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Larry Hastings : -- pull_requests: +578 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: I just did my build for 3.6.1rc1 and it looks like `git name-rev --name-only --tags HEAD` returns "3.6.1rc1^0" for some reason. Perhaps "git describe" is the better command to use here? From what I've seen of that, it should do "tag if tagged, else short hash"

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: git actually does not always shorten to 7 characters. In git 2.11 (I think) they shorten to the shortest length to guarantee uniqueness. So `git rev-parse --short HEAD` gives a hash of de04644627 which is 10 characters. --

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Ned Deily : -- pull_requests: +379 ___ Python tracker ___ ___ Python-bugs-list

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: GitHub trims to the first 7 characters. I see no harm in doing that for sys.version (but not tonight) -- ___ Python tracker

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: Yeah, shortening the hash in the version string might be nice. Feel free to do so. It can probably wait for 3.6.2. -- ___ Python tracker

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: copyright==>version string (sys.version) Also, that part is clearly not release blocking. My PR for 2.7 is waiting for Travis to catch up, so once that's done and Ned has finished his backports (or Larry and Ben have backported to their versions?) we can lower

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: Here's some sample output with the change: C:\build\cpython36>PCbuild\win32\python_d.exe Python 3.6.0+ (3.6:95c50e5aed9e5683676e18349dd94b11901a66b3, Mar 4 2017, 06:08:54) [MSC v.1900 32 bit (Intel)] on win32 Type "help", "copyright", "credits" or "license" for

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Ned Deily : -- pull_requests: +378 ___ Python tracker ___ ___ Python-bugs-list

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Steve Dower : -- pull_requests: +377 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Steve Dower : -- pull_requests: +376 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Steve Dower : -- pull_requests: +375 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Steve Dower : -- pull_requests: +374 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: I finally took a close look at this and I think the approach Brett advocated here is a bit too simple and does not cover the use case I had in mind when I suggested we needed to have a replacement for sys._mercurial. Previously when building from a source repo,

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Ned Deily : -- pull_requests: +372 ___ Python tracker ___ ___ Python-bugs-list

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: I had thought about trying to pull down the remote but it did seems unnecessarily messy when the SHA1 hash should match across various remotes only when the commits actually match. -- ___ Python tracker

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: Just updated my PR to remove the GITTAG variable, so we'll just go with GITBRANCH and GITVERSION. (Any value in trying to extract the URL of the remote? That's probably going to be a bit flimsy, but might help more clearly identify forks.) --

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: I purposefully left the tag out because I don't think it's useful (a tag is just a conveniently named hash and all of our tags are version numbers and that's already available in other parts of the sys module). --

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: It looks to me like we want: branch=`git name-rev --name-only HEAD` revision=`git rev-parse HEAD` tag=`git name-rev --tags --name-only HEAD` Unless we're planning on leaving out the tag? My PR 262 makes the Windows build changes in master, but doesn't change

[issue27593] Deprecate sys._mercurial and create sys._git

Changes by Steve Dower : -- pull_requests: +234 ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: Yeah, I'll get to the non-Windows parts shortly. I'd been waiting for the transition to happen. -- ___ Python tracker ___

[issue27593] Deprecate sys._mercurial and create sys._git

Steve Dower added the comment: This is now blocking all releases for all versions. I'll try and make some time to update the Windows build scripts and project files, but if someone else gets there first feel free to post a PR. -- nosy: +benjamin.peterson, larry, steve.dower priority:

[issue27593] Deprecate sys._mercurial and create sys._git

Stéphane Wirtel added the comment: Hi Brett, With your comment, I have added the modified ./configure. Here is the last patch including the indentation. -- Added file: http://bugs.python.org/file45154/issue27593-with-indent-3.7-2.diff ___ Python

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: I'll get to this one shortly. -- assignee: brett.cannon -> ned.deily ___ Python tracker ___

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: The inclusion of changes to ./configure is on purpose since the file is in the repository and not everyone has autoconf installed to necessarily re-generate the file (and we have had issues with people using really old versions of autoconf in the past).

[issue27593] Deprecate sys._mercurial and create sys._git

Stéphane Wirtel added the comment: Hello Brett, after my review, I propose this patch where I have added the missing indents and remove the ./configure file (because this one can be generated by autoreconf) -- nosy: +matrixise Added file:

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: Sounds good. On Sun, Sep 11, 2016, 11:13 Ned Deily wrote: > > Ned Deily added the comment: > > Thanks for the patch, Brett. Having done a quick test, I'd like to review > this in more detail before applying but that will have to wait

[issue27593] Deprecate sys._mercurial and create sys._git

Ned Deily added the comment: Thanks for the patch, Brett. Having done a quick test, I'd like to review this in more detail before applying but that will have to wait until after b1. If you want, you can reassign this to me. -- priority: release blocker -> deferred blocker stage: ->

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: Here is a patch to add sys._git and update Py_GetBuildInfo() as necessary. I would like to see this in Python 3.6 as 3.6.0 will be released using Mercurial but (hopefully) subsequent releases will be on git, so any reviews will be appreciated. I will hold off

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: https://github.com/python/cpython/blob/master/Modules/getbuildinfo.c will need to be updated on top of configure.ac and Makefile.pre.in. -- ___ Python tracker

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: Get the current revision: `git rev-parse HEAD` -- ___ Python tracker ___ ___

[issue27593] Deprecate sys._mercurial and create sys._git

Brett Cannon added the comment: Get the current branch: `git rev-parse --abbrev-ref HEAD` -- assignee: -> brett.cannon ___ Python tracker ___

[issue27593] Deprecate sys._mercurial and create sys._git

New submission from Brett Cannon: This is part of the GitHub migration. And by "deprecate" sys._mercurial I mean fill it with default values (https://www.python.org/dev/peps/pep-0512/#deprecate-sys-mercurial). -- components: Library (Lib) messages: 271037 nosy: brett.cannon priority: