Merge branch '0.6.x' into 'master'

VIDA-NYU · Mar 1, 2015 · e046f1f · e046f1f
2 parents c26ec9c + 06897c3
commit e046f1f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 9 deletions.
diff --git a/reprounzip-docker/README.rst b/reprounzip-docker/README.rst
@@ -30,6 +30,6 @@ our `documentation <http://reprozip.readthedocs.org/>`_.
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 
 * `Fernando Chirigati <http://vgc.poly.edu/~fchirigati/>`_
-* `Rémi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
+* `Remi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
 * `Juliana Freire <http://vgc.poly.edu/~juliana/>`_
diff --git a/reprounzip-docker/setup.py b/reprounzip-docker/setup.py
@@ -1,3 +1,4 @@
+import io
 import os
 from setuptools import setup
 
@@ -6,7 +7,8 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 
-with open('README.rst') as fp:
+# Need to specify encoding for PY3, which has the worse unicode handling ever
+with io.open('README.rst', encoding='utf-8') as fp:
     description = fp.read()
 setup(name='reprounzip-docker',
       version='0.6',

diff --git a/reprounzip-vagrant/README.rst b/reprounzip-vagrant/README.rst
@@ -30,6 +30,6 @@ our `documentation <http://reprozip.readthedocs.org/>`_.
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 
 * `Fernando Chirigati <http://vgc.poly.edu/~fchirigati/>`_
-* `Rémi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
+* `Remi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
 * `Juliana Freire <http://vgc.poly.edu/~juliana/>`_
diff --git a/reprounzip-vagrant/setup.py b/reprounzip-vagrant/setup.py
@@ -1,3 +1,4 @@
+import io
 import os
 from setuptools import setup
 
@@ -6,7 +7,8 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 
-with open('README.rst') as fp:
+# Need to specify encoding for PY3, which has the worse unicode handling ever
+with io.open('README.rst', encoding='utf-8') as fp:
     description = fp.read()
 setup(name='reprounzip-vagrant',
       version='0.6',

diff --git a/reprounzip-vistrails/README.rst b/reprounzip-vistrails/README.rst
@@ -28,6 +28,6 @@ our `documentation <http://reprozip.readthedocs.org/>`_.
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 
 * `Fernando Chirigati <http://vgc.poly.edu/~fchirigati/>`_
-* `Rémi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
+* `Remi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
 * `Juliana Freire <http://vgc.poly.edu/~juliana/>`_
diff --git a/reprounzip-vistrails/setup.py b/reprounzip-vistrails/setup.py
@@ -1,3 +1,4 @@
+import io
 import os
 from setuptools import setup
 import sys
@@ -7,7 +8,8 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 
-with open('README.rst') as fp:
+# Need to specify encoding for PY3, which has the worse unicode handling ever
+with io.open('README.rst', encoding='utf-8') as fp:
     description = fp.read()
 req = [
     'reprounzip>=0.5',

diff --git a/reprounzip/README.rst b/reprounzip/README.rst
@@ -28,6 +28,6 @@ our `documentation <http://reprozip.readthedocs.org/>`_.
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 
 * `Fernando Chirigati <http://vgc.poly.edu/~fchirigati/>`_
-* `Rémi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
+* `Remi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
 * `Juliana Freire <http://vgc.poly.edu/~juliana/>`_
diff --git a/reprozip/README.rst b/reprozip/README.rst
@@ -28,6 +28,6 @@ our `documentation <http://reprozip.readthedocs.org/>`_.
 ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. The team includes:
 
 * `Fernando Chirigati <http://vgc.poly.edu/~fchirigati/>`_
-* `Rémi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
+* `Remi Rampin <https://www.linkedin.com/profile/view?id=98448601>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
 * `Juliana Freire <http://vgc.poly.edu/~juliana/>`_
diff --git a/reprozip/setup.py b/reprozip/setup.py
@@ -1,3 +1,4 @@
+import io
 import os
 import platform
 from setuptools import setup, Extension
@@ -32,7 +33,8 @@
                      sources=sources,
                      libraries=libraries)
 
-with open('README.rst') as fp:
+# Need to specify encoding for PY3, which has the worse unicode handling ever
+with io.open('README.rst', encoding='utf-8') as fp:
     description = fp.read()
 req = [
     'PyYAML',