Merge branch '1.0.x' into 'master'

VIDA-NYU · Dec 4, 2018 · 0cca1f1 · 0cca1f1
2 parents 5343603 + da897cb
commit 0cca1f1
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/.travis/test.sh b/.travis/test.sh
@@ -3,7 +3,7 @@
 set -eux
 
 export REPROZIP_USAGE_STATS=off
-export REPROZIP_PARAMETERS=https://reprozip-stats.poly.edu/parameters/travis/
+export REPROZIP_PARAMETERS=https://stats.reprozip.org/parameters/travis/
 
 case "$TEST_MODE"
 in

diff --git a/reprounzip-qt/reprounzip_qt/usage.py b/reprounzip-qt/reprounzip_qt/usage.py
@@ -17,7 +17,7 @@
     '~/.reprozip/usage_stats',
     usagestats.Prompt(''),
     os.environ.get('REPROZIP_USAGE_URL', 'https://stats.reprozip.org/'),
-    version=('reprounzip-qt', version),
+    version='%s %s' % ('reprounzip-qt', version),
     unique_user_id=True,
     env_var='REPROZIP_USAGE_STATS',
     ssl_verify=_certificate_file.path

diff --git a/reprounzip/reprounzip/parameters.py b/reprounzip/reprounzip/parameters.py
@@ -279,12 +279,18 @@ def get_parameter(section):
                         "distribution": "fedora",
                         "image": "fedora:28",
                         "name": "Fedora 28"
+                    },
+                    {
+                        "version": "^29$",
+                        "distribution": "fedora",
+                        "image": "fedora:29",
+                        "name": "Fedora 29"
                     }
                 ],
                 "default": {
                     "distribution": "fedora",
-                    "image": "fedora:28",
-                    "name": "Fedora 28"
+                    "image": "fedora:29",
+                    "name": "Fedora 29"
                 }
             }
         ]
@@ -501,6 +507,38 @@ def get_parameter(section):
                             "x86_64": "remram/fedora-24-amd64"
                         },
                         "name": "Fedora 24"
+                    },
+                    {
+                        "version": "^25$",
+                        "distribution": "fedora",
+                        "architectures": {
+                            "x86_64": "bento/fedora-25"
+                        },
+                        "name": "Fedora 25"
+                    },
+                    {
+                        "version": "^26$",
+                        "distribution": "fedora",
+                        "architectures": {
+                            "x86_64": "bento/fedora-26"
+                        },
+                        "name": "Fedora 26"
+                    },
+                    {
+                        "version": "^27$",
+                        "distribution": "fedora",
+                        "architectures": {
+                            "x86_64": "bento/fedora-27"
+                        },
+                        "name": "Fedora 27"
+                    },
+                    {
+                        "version": "^28$",
+                        "distribution": "fedora",
+                        "architectures": {
+                            "x86_64": "bento/fedora-28"
+                        },
+                        "name": "Fedora 28"
                     }
                 ],
                 "default": {