Merge pull request #4190 from irgolic/statistics-324-update

Adapt usage statistics for orange-canvas-core 0.1.9

Author: markotoplak

Orange/canvas/__main__.py

@@ -160,7 +160,6 @@ def open_link(url: QUrl):
 
             if not settings.contains('reporting/machine-id'):
                 settings.setValue('reporting/machine-id', str(uuid.uuid4()))
-        pass
     else:
         QDesktopServices.openUrl(url)
 
@@ -332,8 +331,7 @@ def send_statistics(url):
 
         is_anaconda = 'Continuum' in sys.version or 'conda' in sys.version
 
-        usage = UsageStatistics()
-        data = usage.load()
+        data = UsageStatistics.load()
         for d in data:
             d["Orange Version"] = d.pop("Application Version", "")
             d["Anaconda"] = is_anaconda
@@ -342,11 +340,11 @@ def send_statistics(url):
             r = requests.post(url, files={'file': json.dumps(data)})
             if r.status_code != 200:
                 log.warning("Error communicating with server while attempting to send "
-                            "usage statistics.")
+                            "usage statistics. Status code " + str(r.status_code))
                 return
             # success - wipe statistics file
             log.info("Usage statistics sent.")
-            with open(usage.filename(), 'w', encoding="utf-8") as f:
+            with open(UsageStatistics.filename(), 'w', encoding="utf-8") as f:
                 json.dump([], f)
         except (ConnectionError, requests.exceptions.RequestException):
             log.warning("Connection error while attempting to send usage statistics.")

conda-recipe/meta.yaml

@@ -54,7 +54,7 @@ requirements:
     - opentsne      >=0.3.11
     - pandas
     - pyyaml
-    - orange-canvas-core  >=0.1.7
+    - orange-canvas-core  >=0.1.9
     - orange-widget-base
 
 test:

requirements-gui.txt

@@ -1,4 +1,4 @@
-orange-canvas-core>=0.1.7,<0.2a
+orange-canvas-core>=0.1.9,<0.2a
 orange-widget-base>=4.1.0
 
 # PyQt4/PyQt5 compatibility