diff --git a/README.md b/README.md index 40cab8e5c7a2f5d03367604f799bc4aedb6e286e..6ef1063bb6ed23e7e55118d94623859281eab234 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,10 @@ contributing, and API reference. Omitted versions are plain bugfix releases with only minor changes and fixes. +### v0.7.5 +- optimized API logs +- minor bugfixes + ### v0.7.3 - fixed aborted raw-file downloads - improved representation of data availability (staging, embargo, public) in GUI diff --git a/gitinfo.sh b/gitinfo.sh index 9d3d93c7733fcf8071772ea906e17a6b3004dab2..bbaf0cc3902109f3ef97a180317c23639f5bdb02 100755 --- a/gitinfo.sh +++ b/gitinfo.sh @@ -1,2 +1,2 @@ #!/bin/sh -echo log, ref, version, commit = \"$(git log -1 --oneline)\", \"$(git describe --all)\", \"$(git describe --tags)\", \"$(git rev-parse --verify HEAD)\" > nomad/gitinfo.py \ No newline at end of file +echo log, ref, version, commit = \"$(git log -1 --oneline)\", \"$(git describe --all)\", \"$(git describe --tags)\", \"$(git rev-parse --verify --short HEAD)\" > nomad/gitinfo.py \ No newline at end of file diff --git a/gui/generateBuildVersion.js b/gui/generateBuildVersion.js index 8a5482b95848b05ece4a3e4c67fee791e9aae614..3121532cd7fa7a7c5115566001a0f0a4703925f0 100644 --- a/gui/generateBuildVersion.js +++ b/gui/generateBuildVersion.js @@ -1,10 +1,10 @@ const fs = require('fs') const packageJson = require('./package.json') -const appVersion = packageJson.version +const appCommit = packageJson.commit const jsonData = { - version: appVersion + commit: appCommit } var jsonContent = JSON.stringify(jsonData) diff --git a/gui/package.json b/gui/package.json index d604db0309f10e1a48fd0cf6e523124af1d7ae09..d9ae2bb3df73ea1af723bede3b187d75ddb5e067 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,6 +1,7 @@ { "name": "nomad-fair-gui", - "version": "nomad-gui-version-placeholder", + "version": "0.7.5", + "commit": "nomad-gui-commit-placeholder", "private": true, "dependencies": { "@material-ui/core": "^3.9.3", diff --git a/gui/src/components/About.js b/gui/src/components/About.js index 2ad1f78447e5fd812ba4856dc8bd2dafe42f3569..3c72cdb0a051ae7a2d0e78ff1a8314387886e2f2 100644 --- a/gui/src/components/About.js +++ b/gui/src/components/About.js @@ -85,8 +85,8 @@ class About extends React.Component { ` : ''} ### About this version - - version (API): \`${info ? info.version : 'loading'}/${info ? info.release : 'loading'}\` - - version (GUI): \`${packageJson.version}\` + - version (API): \`${info ? info.version : 'loading'}/${info ? info.git.commit : 'loading'}\` + - version (GUI): \`${packageJson.version}/${packageJson.commit}\` - domain: ${info ? info.domain.name : 'loading'} - git: \`${info ? info.git.ref : 'loading'}; ${info ? info.git.version : 'loading'}\` - last commit message: *${info ? info.git.log : 'loading'}* diff --git a/gui/src/components/App.js b/gui/src/components/App.js index 763ef0213762e76ae2294f895b890304bc81fc9e..027709b2be6c1fea67a3374f1959d04e9a9efac5 100644 --- a/gui/src/components/App.js +++ b/gui/src/components/App.js @@ -187,7 +187,7 @@ class NavigationUnstyled extends React.Component { } }).then((response) => response.json()) .then((meta) => { - if (meta.version !== packageJson.version) { + if (meta.commit !== packageJson.commit) { console.log('GUI API version mismatch') this.setState({showReloadSnack: true}) } diff --git a/gui/version.sh b/gui/version.sh index 414130418562b9320e6db07b538032f4bae3e79c..b463b6366c891b749d15e10cf7f5d9686544b6b4 100755 --- a/gui/version.sh +++ b/gui/version.sh @@ -1,4 +1,4 @@ #!/bin/sh -version=`git describe --tags` -sed -i -e "s/nomad-gui-version-placeholder/$version/g" package.json +commit=`git rev-parse --short --verify HEAD` +sed -i -e "s/nomad-gui-commit-placeholder/$commit/g" package.json rm -f package.json-e diff --git a/nomad/app/api/info.py b/nomad/app/api/info.py index db2dc055905aff7e05adfa80847638fdc8e4fc46..1879dc57044e4d76fabb3980d7e585d75a22fd53 100644 --- a/nomad/app/api/info.py +++ b/nomad/app/api/info.py @@ -92,6 +92,7 @@ class InfoResource(Resource): 'git': { 'ref': gitinfo.ref, 'version': gitinfo.version, + 'commit': gitinfo.commit, 'log': gitinfo.log } }, 200 diff --git a/nomad/config.py b/nomad/config.py index 0ccc096219b6903312df40f5243ed0dc5dfc380a..5cb5a6b41b2cdadd690dff0bfda9da4204247b45 100644 --- a/nomad/config.py +++ b/nomad/config.py @@ -208,7 +208,7 @@ datacite = NomadConfig( password='*' ) -version = '0.7.3' +version = '0.7.5' commit = gitinfo.commit release = 'devel' domain = 'DFT' diff --git a/ops/helm/nomad/Chart.yaml b/ops/helm/nomad/Chart.yaml index f4156c20231a276c0a92559103c7e1ccdc305df2..582a6adbde3baf0ba8cc7dec1b6105b41a0609cc 100644 --- a/ops/helm/nomad/Chart.yaml +++ b/ops/helm/nomad/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "0.7.3" +appVersion: "0.7.5" description: A Helm chart for Kubernetes that only runs nomad services and uses externally hosted databases. name: nomad -version: 0.7.3 +version: 0.7.5 diff --git a/setup.py b/setup.py index 4f660f584b77db8639517083bfc87679c63316a1..b8f2ceb0ed163af56adefb1a92be092229d65fef 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ reqs = [str(ir.req) for ir in install_reqs if 'sphinxcontrib.httpdomain' not in setup( name='nomad', - version='0.7.3', + version='0.7.5', description='The nomad@FAIRDI infrastructure python package', py_modules=['nomad'], install_requires=reqs,