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

Print git revision and branch in bootstrap.py instead of mercurial #2410

Merged
merged 3 commits into from
Jun 1, 2015

Conversation

Nodd
Copy link
Contributor

@Nodd Nodd commented May 6, 2015

bootstrap.py still searched for a mercurial revision number. Now it uses git.

I added the search for the branch name.

@ccordoba12 ccordoba12 added this to the v3.0 milestone May 6, 2015
@ccordoba12
Copy link
Member

@Nodd, this one failed, according to travis

@Nodd
Copy link
Contributor Author

Nodd commented May 6, 2015

Forgot about python3 compatibility... Travis is really useful ! 😄

@Nodd
Copy link
Contributor Author

Nodd commented May 6, 2015

Now Travis is happy !

@ccordoba12
Copy link
Member

Getting the current git branch is not working in Python 3 (or at least is not shown after running bootstrap), but it's working fine in Python 2.

The branch I'm working on is (detached from nodd/git-revision), after running git checkout nodd/git-revision. I don't know if this matters, but I'm mentioning it in case it's important :-)

@Nodd
Copy link
Contributor Author

Nodd commented May 27, 2015

It should work now, and the code is clearer too.

@ccordoba12
Copy link
Member

Have you tested this PR on Windows? If not, could you do it to see if there are no problems there?

@goanpeca
Copy link
Member

I tested on windows, seems to be working fine

@ccordoba12
Copy link
Member

Great, thanks @goanpeca. Merging then ;-)

ccordoba12 added a commit that referenced this pull request Jun 1, 2015
Print git revision and branch in bootstrap.py instead of mercurial
@ccordoba12 ccordoba12 merged commit 133cbf3 into spyder-ide:master Jun 1, 2015
@Nodd Nodd deleted the git-revision branch June 9, 2016 21:14
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