[tor-commits] [ooni-probe/master] The version numbers of oonideckgen, oonireport and ooniresources are now the same of ooniprobe

[art]

commit 9f92dc3eefef065ef0be7b577950e2c916f2cc47
Author: Arturo Filastò <art...@filasto.net>
Date:   Fri Sep 16 11:57:02 2016 +0200

    The version numbers of oonideckgen, oonireport and ooniresources are now 
the same of ooniprobe
---
 ooni/scripts/oonideckgen.py   | 4 +---
 ooni/scripts/oonireport.py    | 3 +--
 ooni/scripts/ooniresources.py | 3 ++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ooni/scripts/oonideckgen.py b/ooni/scripts/oonideckgen.py
index 4ad0f59..ba27ffe 100644
--- a/ooni/scripts/oonideckgen.py
+++ b/ooni/scripts/oonideckgen.py
@@ -11,10 +11,8 @@ from ooni.otime import prettyDateNowUTC
 from ooni import errors
 from ooni.geoip import probe_ip
 from ooni.resources import check_for_update
-from ooni.settings import config
 from ooni.deck import NGDeck
-
-__version__ = "1.0.0"
+from ooni import __version__
 
 class Options(usage.Options):
     synopsis = """%s [options]
diff --git a/ooni/scripts/oonireport.py b/ooni/scripts/oonireport.py
index cd9b244..f7896aa 100644
--- a/ooni/scripts/oonireport.py
+++ b/ooni/scripts/oonireport.py
@@ -14,8 +14,7 @@ from ooni.reporter import OONIBReporter, OONIBReportLog
 from ooni.utils import log
 from ooni.settings import config
 from ooni.backend_client import BouncerClient, CollectorClient
-
-__version__ = "0.1.0"
+from ooni import __version__
 
 @defer.inlineCallbacks
 def lookup_collector_client(report_header, bouncer):
diff --git a/ooni/scripts/ooniresources.py b/ooni/scripts/ooniresources.py
index 8e77431..2ce5c9e 100644
--- a/ooni/scripts/ooniresources.py
+++ b/ooni/scripts/ooniresources.py
@@ -1,6 +1,7 @@
 import sys
 
 from twisted.python import usage
+from ooni import __version__
 
 class Options(usage.Options):
     synopsis = """%s
@@ -17,7 +18,7 @@ class Options(usage.Options):
     optParameters = []
 
     def opt_version(self):
-        print("ooniresources version: 0.2.0")
+        print("ooniresources version: %s" % __version__)
         sys.exit(0)
 
 




_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits