Merge branch '1.0.x' into 'master'

VIDA-NYU · Jan 3, 2017 · 7a42f79 · 7a42f79
2 parents 990b682 + d1ab8c2
commit 7a42f79
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 50 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -3,7 +3,7 @@ ReproZip's Documentation
 
 Welcome to ReproZip's documentation!
 
-`ReproZip <https://vida-nyu.github.io/reprozip/>`__ is a tool aimed at simplifying the process of creating reproducible experiments from *command-line executions*. It tracks operating system calls and creates a package that contains all the binaries, files, and dependencies required to run a given command on the author's computational environment. A reviewer can then extract the experiment in his own environment to reproduce the results, even if the environment has a different operating system from the original one.
+`ReproZip <https://www.reprozip.org/>`__ is a tool aimed at simplifying the process of creating reproducible experiments from *command-line executions*. It tracks operating system calls and creates a package that contains all the binaries, files, and dependencies required to run a given command on the author's computational environment. A reviewer can then extract the experiment in his own environment to reproduce the results, even if the environment has a different operating system from the original one.
 
 Currently, ReproZip can only pack experiments that originally run on Linux.
 
@@ -34,7 +34,7 @@ Contents
 Links
 -----
 
-* `Project website <https://vida-nyu.github.io/reprozip/>`__
+* `Project website <https://www.reprozip.org/>`__
 * `GitHub repository <https://github.com/ViDA-NYU/reprozip>`__
 * Mailing lists:
 

diff --git a/docs/install.rst b/docs/install.rst
@@ -4,7 +4,7 @@ Installation
 ************
 
 ReproZip is available as open source, released under the Revised BSD License. The tool is comprised of two components: **reprozip** (for the packing step) and **reprounzip** (for the unpack step). Additional components and plugins are also provided for *reprounzip*: **reprounzip-vagrant**, which unpacks the experiment in a Vagrant virtual machine; **reprounzip-docker**, which unpacks the experiment in a Docker container; and **reprounzip-vistrails**, which creates a VisTrails workflow to reproduce the experiment. More plugins may be developed in the future (and, of course, you are free to :ref:`roll your own <develop-plugins>`).
-In our `website <https://vida-nyu.github.io/reprozip/>`__, you can find links to our PyPI packages and our `GitHub repository <https://github.com/ViDA-NYU/reprozip>`__.
+In our `website <https://www.reprozip.org/>`__, you can find links to our PyPI packages and our `GitHub repository <https://github.com/ViDA-NYU/reprozip>`__.
 
 In the following, you will find installation instructions for :ref:`linux`, :ref:`mac`, and :ref:`windows`. ReproZip is also available for the :ref:`conda` Python distribution.
 

diff --git a/reprounzip/reprounzip/parameters.py b/reprounzip/reprounzip/parameters.py
@@ -192,67 +192,27 @@ def get_parameter(section):
     '          {\n'
     '            "version": "^5(\\\\.|$)",\n'
     '            "distribution": "centos",\n'
-    '            "image": "centos5",\n'
+    '            "image": "centos:centos5",\n'
     '            "name": "CentOS 5"\n'
     '          },\n'
     '          {\n'
     '            "version": "^6(\\\\.|$)",\n'
     '            "distribution": "centos",\n'
-    '            "image": "centos6",\n'
+    '            "image": "centos:centos6",\n'
     '            "name": "CentOS 6"\n'
     '          },\n'
     '          {\n'
     '            "version": "^7(\\\\.|$)",\n'
     '            "distribution": "centos",\n'
-    '            "image": "centos7",\n'
+    '            "image": "centos:centos7",\n'
     '            "name": "CentOS 7"\n'
     '          }\n'
     '        ],\n'
     '        "default": {\n'
     '          "distribution": "centos",\n'
-    '          "image": "centos7",\n'
+    '          "image": "centos: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
@@ -43,9 +43,7 @@ def get(architecture, distribution, version):
         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'))
+                         ('centos', 'centos:centos7'))
 
     def test_vagrant(self):
         def get(architecture, distribution, version, gui=False):