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

Fix version display during startup #997

Merged
merged 3 commits into from Aug 14, 2018

Conversation

@jougs
Copy link
Contributor

@jougs jougs commented Aug 7, 2018

This PR addresses two issues:

  • remove the confusing printout of the git branch and hash during the run of cmake
  • make nest and sli print the correct version information or git branch and hash during startup instead of always the last released version number.

As these issues were initially discussed by @steffengraber and @heplesser on the mailing list, I suggest them to be reviewers for the PR.

jougs added 2 commits Aug 7, 2018
Signed-off-by: Jochen Martin Eppler <j.eppler@fz-juelich.de>
Copy link
Contributor

@heplesser heplesser left a comment

Looks fine to me. What will happen for a NEST Release version? Will that show the 2.14 or so tag, or will it only show the hash?

@jougs
Copy link
Contributor Author

@jougs jougs commented Aug 7, 2018

For a release it will show the tag, i.e. something like v2.14.0.

Copy link
Collaborator

@steffengraber steffengraber left a comment

With sli everything seams to be ok, but in python I recieve:

-- N E S T --

Copyright (C) 2004 The NEST Initiative
Version 2.14.0 Aug 13 2018 09:20:53

Aug 13 09:24:34 SLIInterpreter::execute [Error]: DictError
Key '/warranty' does not exist in dictionary.

I'm gonna take a closer look at that, too.

@steffengraber
Copy link
Collaborator

@steffengraber steffengraber commented Aug 14, 2018

There is the 'pynest/nest/pynest-init.sli'. Does this file needs to be customized for the message in Pynest?

@jougs
Copy link
Contributor Author

@jougs jougs commented Aug 14, 2018

@steffengraber: good catch. The pywelcome implementation completely slipped my attention. I have adapted it in 898ab1b to match the implementation of the normal welcome function.

Copy link
Collaborator

@steffengraber steffengraber left a comment

works fine.

@heplesser heplesser merged commit 8bc7564 into nest:master Aug 14, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@heplesser heplesser added this to the NEST 2.16 milestone Aug 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.