[ooni-probe/master] The version number in master should always be greater than the latest… (#506)

[art at torproject.org]

commit 2e9ef148f2d6647985cd633373b74c3761491379
Author: Arturo Filastò <arturo at filasto.net>
Date:   Wed May 18 17:02:17 2016 +0200

    The version number in master should always be greater than the latest… (#506)
    
    * The version number in master should always be greater than the latest release
    
    This is to allow us to distinguish reports that are run from ooniprobe versions
    cloned from master and those run from packages.
    
    * Have a different version number for the resources than the ooniprobe version
---
 ooni/__init__.py           | 5 ++++-
 ooni/resources/__init__.py | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ooni/__init__.py b/ooni/__init__.py
index 8e05068..15e4278 100644
--- a/ooni/__init__.py
+++ b/ooni/__init__.py
@@ -1,7 +1,10 @@
 # -*- encoding: utf-8 -*-
 
 __author__ = "Open Observatory of Network Interference"
-__version__ = "1.4.2"
+__version__ = "1.5.0-master"
+# This is the version number of resources to be downloaded
+# when a release is made it should be aligned to __version__
+__resources_version__ = "1.4.2"
 
 __all__ = ['config', 'inputunit', 'kit',
            'lib', 'nettest', 'oonicli', 'report', 'reporter',
diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py
index 4b163bb..cc1da79 100644
--- a/ooni/resources/__init__.py
+++ b/ooni/resources/__init__.py
@@ -1,6 +1,7 @@
-from ooni import __version__ as ooniprobe_version
+from ooni import __resources_version__ as resources_version
 
 __version__ = "0.2.0"
 
 ooni_resources_url = ("https://github.com/TheTorProject/ooni-probe/releases"
-                      "/download/v{}/ooni-resources.tar.gz").format(ooniprobe_version)
+                      "/download/v{}/"
+                      "ooni-resources.tar.gz").format(resources_version)