Merge branch '1.0.x' into 'master'

remram44 · remram44 · commit 6d1bb63a7387 · 2016-07-14T23:10:40.000-04:00
diff --git a/docs/install.rst b/docs/install.rst
@@ -43,11 +43,11 @@ Besides Python and pip, each component or plugin to be used may have additional
 
 ..  [#bug] ``reprozip`` and ``reprounzip graph`` will not work before 2.7.3 due to `Python bug 13676 <http://bugs.python.org/issue13676>`__ related to sqlite3. Python 2.6 is ancient and unsupported.
 ..  [#deb] On Debian and Debian-based, you can use ``sudo apt-get install python``.
-..  [#yum] On RPM-based distributions, such as Red Hat, Fedora or CentOS, you can use ``yum install python``
+..  [#yum] On RPM-based distributions, such as Red Hat, Fedora, or CentOS, you can use ``yum install python``
 ..  [#deb2] On Debian and Debian-based, you can use ``sudo apt-get install libsqlite3-dev``.
-..  [#yum2] On RPM-based distributions, such as Red Hat, Fedora or CentOS, you can use ``yum install sqlite-devel``
+..  [#yum2] On RPM-based distributions, such as Red Hat, Fedora, or CentOS, you can use ``yum install sqlite-devel``
 ..  [#deb3] On Debian and Debian-based, you can use ``sudo apt-get install python-dev``.
-..  [#yum3] On RPM-based distributions, such as Red Hat, Fedora or CentOS, you can use ``yum install python-devel``
+..  [#yum3] On RPM-based distributions, such as Red Hat, Fedora, or CentOS, you can use ``yum install python-devel``
 ..  [#pycrypto] Required to build `PyCrypto <https://www.dlitz.net/software/pycrypto/>`__.
 ..  [#vis1] `VisTrails v2.2.3+ <http://www.vistrails.org/>`__ is required to run the workflow generated by the plugin.
 
diff --git a/docs/packing.rst b/docs/packing.rst
@@ -24,7 +24,7 @@ Multiple runs can also be traced and combined in a single package by using the f
 
 Note that the final package will be able to reproduce any of the runs, and files shared by multiple runs are only stored once.
 
-By default, if the operating system is based on Debian or RPM packages, (e.g.: Ubuntu, CentOS, ...), *reprozip* will also try to automatically identify the distribution packages from which the files come, using the available `package manager <http://en.wikipedia.org/wiki/Dpkg>`__ of the system. This is useful to provide more detailed information about the dependencies, as well as to further help when reproducing the experiment. However, note that the ``trace`` command can take some time doing that after the experiment finishes, depending on the number of file dependencies that the experiment has. To disable this feature, users may use the flag ``--dont-identify-packages``::
+By default, if the operating system is based on Debian or RPM packages (e.g.: Ubuntu, CentOS, Fedora, ...), *reprozip* will also try to automatically identify the distribution packages from which the files come, using the available package manager of the system. This is useful to provide more detailed information about the dependencies, as well as to further help when reproducing the experiment. However, note that the ``trace`` command can take some time doing that after the experiment finishes, depending on the number of file dependencies that the experiment has. To disable this feature, users may use the flag ``--dont-identify-packages``::
 
     $ reprozip trace --dont-identify-packages <command-line>
 
diff --git a/docs/unpacking.rst b/docs/unpacking.rst
@@ -162,7 +162,7 @@ The `installpkgs` Unpacker: Installing Software Packages
 
 By default, ReproZip identifies if the current environment already has the required software packages for the experiment, then using the installed ones for reproduction. For the non-installed software packages, it uses the dependencies packed in the original environment and extracted under the experiment directory.
 
-Users may also let ReproZip try and install all the dependencies of the experiment on their machine by using the *installpkgs* unpacker (``reprounzip installpkgs``). This unpacker currently works for distribution based on Debian or RPM packages (e.g.: Ubuntu, CentOS, ...), and uses the package manager to automatically install all the required software packages directly on the current machine, thus **interfering with your environment**.
+Users may also let ReproZip try and install all the dependencies of the experiment on their machine by using the *installpkgs* unpacker (``reprounzip installpkgs``). This unpacker currently works for distribution based on Debian or RPM packages (e.g.: Ubuntu, CentOS, Fedora, ...), and uses the package manager to automatically install all the required software packages directly on the current machine, thus **interfering with your environment**.
 
 To install the required dependencies, the following command should be used::
 
diff --git a/reprounzip/reprounzip/parameters.py b/reprounzip/reprounzip/parameters.py
@@ -36,7 +36,8 @@ def update_parameters():
 
     url = 'https://reprozip-stats.poly.edu/parameters/'
     env_var = os.environ.get('REPROZIP_PARAMETERS')
-    if env_var.startswith('http://') or env_var.startswith('https://'):
+    if env_var and (
+            env_var.startswith('http://') or env_var.startswith('https://')):
         # This is only used for testing
         # Note that this still expects the ReproZip CA
         url = env_var
@@ -212,6 +213,46 @@ def get_parameter(section):
     '          "image": "centos7",\n'
     '          "name": "CentOS 7"\n'
     '        }\n'
+    '      },\n'
+    '      {\n'
+    '        "name": "^fedora$",\n'
+    '        "versions": [\n'
+    '          {\n'
+    '            "version": "^20$",\n'
+    '            "distribution": "fedora",\n'
+    '            "image": "fedora:20",\n'
+    '            "name": "Fedora 20"\n'
+    '          },\n'
+    '          {\n'
+    '            "version": "^21$",\n'
+    '            "distribution": "fedora",\n'
+    '            "image": "fedora:21",\n'
+    '            "name": "Fedora 21"\n'
+    '          },\n'
+    '          {\n'
+    '            "version": "^22$",\n'
+    '            "distribution": "fedora",\n'
+    '            "image": "fedora:22",\n'
+    '            "name": "Fedora 22"\n'
+    '          },\n'
+    '          {\n'
+    '            "version": "^23$",\n'
+    '            "distribution": "fedora",\n'
+    '            "image": "fedora:24",\n'
+    '            "name": "Fedora 23"\n'
+    '          },\n'
+    '          {\n'
+    '            "version": "^24$",\n'
+    '            "distribution": "fedora",\n'
+    '            "image": "fedora:24",\n'
+    '            "name": "Fedora 24"\n'
+    '          }\n'
+    '        ],\n'
+    '        "default": {\n'
+    '          "distribution": "fedora",\n'
+    '          "image": "fedora:24",\n'
+    '          "name": "Fedora 24"\n'
+    '        }\n'
     '      }\n'
     '    ]\n'
     '  },\n'
diff --git a/tests/test_parameters.py b/tests/test_parameters.py
@@ -38,12 +38,14 @@ def get(architecture, distribution, version):
         self.assertEqual(get('x86_64', 'Ubuntu', '1.1'),
                          ('ubuntu', 'ubuntu:15.10'))
         self.assertRaises(SystemExit, get, 'armv7', 'Debian', '8.2')
-        self.assertEqual(get('x86_64', 'Fedora', '12'),
+        self.assertEqual(get('x86_64', 'Arch', '2015.06.01'),
                          ('debian', 'debian:jessie'))
         self.assertEqual(get('x86_64', 'Debian', '1'),
                          ('debian', 'debian:jessie'))
         self.assertEqual(get('x86_64', 'CentOS', '1'),
                          ('centos', 'centos7'))
+        self.assertEqual(get('x86_64', 'Fedora', '21'),
+                         ('fedora', 'fedora:21'))
 
     def test_vagrant(self):
         def get(architecture, distribution, version):
