From 523c0e415e04691807fe7ff6b16c4067c2aa97c6 Mon Sep 17 00:00:00 2001
From: Cleber Rosa <crosa@redhat.com>
Date: Tue, 26 Apr 2016 22:31:30 -0300
Subject: [PATCH] Avocado: Release 35.0

This release introduces a new versioning scheme, so the "big bump"
from 0.34.0 to 35.0 is not such a big bump.

Some additional changes with regards to versioning were added, such as
the way the remote runner checks for Avocado on the remote host.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 avocado.spec                       | 9 ++++++---
 avocado/core/remote/runner.py      | 2 +-
 avocado/core/version.py            | 9 ++++-----
 docs/source/conf.py                | 2 +-
 selftests/functional/test_basic.py | 6 +++---
 selftests/unit/test_remote.py      | 2 +-
 setup.cfg                          | 2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/avocado.spec b/avocado.spec
index 2de85d5edc..aa7f52fe17 100644
--- a/avocado.spec
+++ b/avocado.spec
@@ -1,13 +1,13 @@
 %global modulename avocado
 %if ! 0%{?commit:1}
- %define commit c71e2c8ef354afa05554ad32aa08d2684b7b5440
+ %define commit c7e3013c180813a90c15a5c3d1cfefea872edca2
 %endif
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Summary: Avocado Test Framework
 Name: avocado
-Version: 0.34.0
-Release: 1%{?dist}
+Version: 35.0
+Release: 0%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://avocado-framework.github.io/
@@ -114,6 +114,9 @@ examples of how to write tests on your own.
 %{_datadir}/avocado/wrappers
 
 %changelog
+* Wed Apr 27 2016 Cleber Rosa <cleber@redhat.com> - 35.0-0
+- New upstream release 35.0 (new versioning scheme)
+
 * Thu Apr 14 2016 Cleber Rosa <cleber@redhat.com> - 0.34.0-1
 - Added job pre/post scripts directories
 
diff --git a/avocado/core/remote/runner.py b/avocado/core/remote/runner.py
index 8a6c31b73a..7fd0a669ac 100644
--- a/avocado/core/remote/runner.py
+++ b/avocado/core/remote/runner.py
@@ -42,7 +42,7 @@ class RemoteTestRunner(TestRunner):
 
     # Let's use re.MULTILINE because sometimes servers might have MOTD
     # that will introduce a line break on output.
-    remote_version_re = re.compile(r'^Avocado (\d+)\.(\d+)\.(\d+)$',
+    remote_version_re = re.compile(r'^Avocado (\d+)\.(\d+)$',
                                    re.MULTILINE)
 
     def _copy_files(self):
diff --git a/avocado/core/version.py b/avocado/core/version.py
index 247e6a4a66..68f49673fe 100755
--- a/avocado/core/version.py
+++ b/avocado/core/version.py
@@ -14,14 +14,13 @@
 # Copyright: Red Hat Inc. 2013-2014
 # Author: Lucas Meneghel Rodrigues <lmr@redhat.com>
 
-__all__ = ['MAJOR', 'MINOR', 'RELEASE', 'VERSION']
+__all__ = ['MAJOR', 'MINOR', 'VERSION']
 
 
-MAJOR = 0
-MINOR = 34
-RELEASE = 0
+MAJOR = 35
+MINOR = 0
 
-VERSION = "%s.%s.%s" % (MAJOR, MINOR, RELEASE)
+VERSION = "%s.%s" % (MAJOR, MINOR)
 
 if __name__ == '__main__':
     print(VERSION)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 9c304fdf5e..4adcfcf995 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -98,7 +98,7 @@
 copyright = u'2014-2015, Red Hat'
 
 version = VERSION
-release = VERSION
+release = 0
 
 if not ON_RTD:  # only import and set the theme if we're building docs locally
     try:
diff --git a/selftests/functional/test_basic.py b/selftests/functional/test_basic.py
index 3272285c9e..67b0fa212b 100644
--- a/selftests/functional/test_basic.py
+++ b/selftests/functional/test_basic.py
@@ -82,9 +82,9 @@ def setUp(self):
     def test_show_version(self):
         result = process.run('./scripts/avocado -v', ignore_status=True)
         self.assertEqual(result.exit_status, 0)
-        self.assertTrue(re.match(r"^Avocado \d+\.\d+\.\d+$", result.stderr),
-                        "Version string does not match 'Avocado \\d\\.\\d\\.\\"
-                        "d':\n%r" % (result.stderr))
+        self.assertTrue(re.match(r"^Avocado \d+\.\d+$", result.stderr),
+                        "Version string does not match 'Avocado \\d\\.\\d:'\n"
+                        "%r" % (result.stderr))
 
     def test_alternate_config_datadir(self):
         """
diff --git a/selftests/unit/test_remote.py b/selftests/unit/test_remote.py
index 7b3a098fce..2ce267340d 100644
--- a/selftests/unit/test_remote.py
+++ b/selftests/unit/test_remote.py
@@ -62,7 +62,7 @@ def setUp(self):
         Remoter = flexmock(remoter.Remote)
         Remoter.new_instances(Remote)
         args_version = 'avocado -v'
-        version_result = flexmock(stdout='Avocado 1.2.3', exit_status=0)
+        version_result = flexmock(stdout='Avocado 1.2', exit_status=0)
         args_env = 'env'
         env_result = flexmock(stdout='''XDG_SESSION_ID=20
 HOSTNAME=rhel7.0
diff --git a/setup.cfg b/setup.cfg
index 225d8ac442..b48cbbcb3e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = avocado
-version = 0.34.0
+version = 35.0
 summary = Avocado Test Framework
 description-file =
     README.rst