From dacc4df6b0756d64b50ec1f7f23dee310aae53d1 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Tue, 4 Feb 2020 08:58:16 +0100
Subject: [PATCH] Updated version and readme for next release.
---
README.md | 4 ++++
gitinfo.sh | 2 +-
gui/generateBuildVersion.js | 4 ++--
gui/package.json | 3 ++-
gui/src/components/About.js | 4 ++--
gui/src/components/App.js | 2 +-
gui/version.sh | 4 ++--
nomad/app/api/info.py | 1 +
nomad/config.py | 2 +-
ops/helm/nomad/Chart.yaml | 4 ++--
setup.py | 2 +-
11 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 40cab8e5c7..6ef1063bb6 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 9d3d93c773..bbaf0cc390 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 8a5482b958..3121532cd7 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 d604db0309..d9ae2bb3df 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 2ad1f78447..3c72cdb0a0 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 763ef02137..027709b2be 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 4141304185..b463b6366c 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 db2dc05590..1879dc5704 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 0ccc096219..5cb5a6b41b 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 f4156c2023..582a6adbde 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 4f660f584b..b8f2ceb0ed 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,
--
GitLab