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

extend API version information #3411

Merged
merged 4 commits into from Jan 18, 2017

Conversation

Projects
None yet
4 participants
@manabuishii
Copy link
Contributor

commented Jan 12, 2017

extend API version information #1907
#1907

extend /api/version

output json file contents with version_major

{
  "extra": {
    "user_tag": "_fix_job_runner_issue",
    "commit-id": "abcde123"
  },
  "version_major": "16.10"
}

First check environment value GALAXY_VERSION_JSON_FILE.
if it's not set, try "galaxy root direcotory"/version.json.

if json file is not find, extra set empty.

extend API version information
extend API version information #1907
#1907

output json file contents with version_major

```
{"extra": {"user_tag": "_fix_job_runner_issue", "commit-id": "abcde123"}, "version_major": "16.10"}
```

First check environment value GALAXY_VERSION_JSON_FILE.
if it's not set, try "galaxy root direcotory"/version.json.

if json file is not find, extra set empty.

@galaxybot galaxybot added the triage label Jan 12, 2017

@galaxybot galaxybot added this to the 17.01 milestone Jan 12, 2017

@martenson

This comment has been minimized.

Copy link
Member

commented Jan 12, 2017

@manabuishii thanks for the PR, please fix the linting errors reported by Travis.

manabuishii added some commits Jan 13, 2017

@martenson

This comment has been minimized.

Copy link
Member

commented Jan 13, 2017

@galaxybot test this

@jmchilton
Copy link
Member

left a comment

Thanks for the contribution @manabuishii. Can you cherry-pick jmchilton@d744f79 into your branch - it cleans up the Python some more.

git remote add jmchilton git@github.com:jmchilton/galaxy.git
git fetch jmchilton
git chery-pick d744f797bf24e7cc57db42342f19c9ee3d2ed494

@martenson martenson modified the milestones: 17.05, 17.01 Jan 13, 2017

More idiomatic Python for extended version information.
- Eliminate the use of a bare except.
- Use a ``with`` to ensure file handling is cleaned up.
@martenson

This comment has been minimized.

Copy link
Member

commented Jan 16, 2017

@galaxybot test this

@jmchilton jmchilton modified the milestones: 17.01, 17.05 Jan 18, 2017

@jmchilton jmchilton merged commit 9646d26 into galaxyproject:dev Jan 18, 2017

4 checks passed

api test Build finished. 256 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 134 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.