From d12143b82cc5476025b6c7c34dde6927dbf45fa4 Mon Sep 17 00:00:00 2001 From: Wilfred Tyler Gee Date: Sun, 3 Dec 2017 17:40:25 +1100 Subject: [PATCH 1/2] Version number updates * Change terminology to match semantic versioning * Don't hard-code version number in test (closes #154) --- pocs/tests/test_observatory.py | 3 ++- pocs/version.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pocs/tests/test_observatory.py b/pocs/tests/test_observatory.py index 5798426e5..bd3c10257 100644 --- a/pocs/tests/test_observatory.py +++ b/pocs/tests/test_observatory.py @@ -8,6 +8,7 @@ from pocs.scheduler.dispatch import Scheduler from pocs.scheduler.observation import Observation from pocs.utils import error +from pocs.version import version has_camera = pytest.mark.skipif( not pytest.config.getoption("--camera"), @@ -168,7 +169,7 @@ def test_standard_headers(observatory): test_headers = { 'airmass': 1.091778, - 'creator': 'POCSv0.5.1', + 'creator': 'POCSv{}'.format(version), 'elevation': 3400.0, 'ha_mnt': 1.6844671878927793, 'latitude': 19.54, diff --git a/pocs/version.py b/pocs/version.py index 940779fc9..d35c7a366 100644 --- a/pocs/version.py +++ b/pocs/version.py @@ -1,6 +1,6 @@ # this file was automatically generated major = 0 minor = 5 -release = 1 +patch = 1 -version = '{}.{}.{}'.format(major, minor, release) +version = '{}.{}.{}'.format(major, minor, patch) From 828b917ca00501a0b864c0d7ff8e59ba55e24287 Mon Sep 17 00:00:00 2001 From: Wilfred Tyler Gee Date: Mon, 4 Dec 2017 09:53:18 +1100 Subject: [PATCH 2/2] Removing erroneous comment --- pocs/version.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pocs/version.py b/pocs/version.py index d35c7a366..63c170546 100644 --- a/pocs/version.py +++ b/pocs/version.py @@ -1,4 +1,3 @@ -# this file was automatically generated major = 0 minor = 5 patch = 1