forked from M-Labs/artiq
PEP440 compliant version numbers
This commit is contained in:
parent
8409a6bb94
commit
3ff0be6540
|
@ -1,4 +1,4 @@
|
||||||
import os
|
import os
|
||||||
|
|
||||||
def get_version():
|
def get_version():
|
||||||
return os.getenv("VERSIONEER_OVERRIDE", default="8.0.beta")
|
return os.getenv("VERSIONEER_OVERRIDE", default="8.0+unknown.beta")
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
artiqVersionMajor = 8;
|
artiqVersionMajor = 8;
|
||||||
artiqVersionMinor = self.sourceInfo.revCount or 0;
|
artiqVersionMinor = self.sourceInfo.revCount or 0;
|
||||||
artiqVersionId = self.sourceInfo.shortRev or "unknown";
|
artiqVersionId = self.sourceInfo.shortRev or "unknown";
|
||||||
artiqVersion = (builtins.toString artiqVersionMajor) + "." + (builtins.toString artiqVersionMinor) + "." + artiqVersionId + ".beta";
|
artiqVersion = (builtins.toString artiqVersionMajor) + "." + (builtins.toString artiqVersionMinor) + "+" + artiqVersionId + ".beta";
|
||||||
artiqRev = self.sourceInfo.rev or "unknown";
|
artiqRev = self.sourceInfo.rev or "unknown";
|
||||||
|
|
||||||
rustManifest = pkgs.fetchurl {
|
rustManifest = pkgs.fetchurl {
|
||||||
|
|
|
@ -11,7 +11,7 @@ def get_rev():
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def get_version():
|
def get_version():
|
||||||
return os.getenv("VERSIONEER_OVERRIDE", default="8.0.beta")
|
return os.getenv("VERSIONEER_OVERRIDE", default="8.0+unknown.beta")
|
||||||
|
|
||||||
def get_rev():
|
def get_rev():
|
||||||
return os.getenv("VERSIONEER_REV", default="unknown")
|
return os.getenv("VERSIONEER_REV", default="unknown")
|
||||||
|
|
Loading…
Reference in New Issue