From 3ff0be6540b5a9eb252cd95db6a812d75e7c8ed2 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 30 Apr 2023 16:55:49 +0800 Subject: [PATCH] PEP440 compliant version numbers --- artiq/_version.py | 2 +- flake.nix | 2 +- versioneer.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/_version.py b/artiq/_version.py index e308ce8c2..bf9797c9d 100644 --- a/artiq/_version.py +++ b/artiq/_version.py @@ -1,4 +1,4 @@ import os def get_version(): - return os.getenv("VERSIONEER_OVERRIDE", default="8.0.beta") + return os.getenv("VERSIONEER_OVERRIDE", default="8.0+unknown.beta") diff --git a/flake.nix b/flake.nix index 1336351bb..2d9a03c12 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ artiqVersionMajor = 8; artiqVersionMinor = self.sourceInfo.revCount or 0; 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"; rustManifest = pkgs.fetchurl { diff --git a/versioneer.py b/versioneer.py index f6393d21e..dcb8bf1b2 100644 --- a/versioneer.py +++ b/versioneer.py @@ -11,7 +11,7 @@ def get_rev(): """ 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(): return os.getenv("VERSIONEER_REV", default="unknown")