From 973716d31052d4d8afb2a1d30e2ebb5a8205f847 Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Sun, 8 Jan 2017 17:30:06 -0800 Subject: [PATCH] Use cloudpickle 0.2.2. (#189) --- .travis/install-dependencies.sh | 12 ++++-------- doc/install-on-macosx.md | 3 +-- doc/install-on-ubuntu.md | 3 +-- docker/base-deps/Dockerfile | 1 - lib/python/MANIFEST.in | 1 - lib/python/setup.py | 2 +- src/common/lib/python/setup.py | 2 +- test/runtest.py | 2 +- 8 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 lib/python/MANIFEST.in diff --git a/.travis/install-dependencies.sh b/.travis/install-dependencies.sh index 2f9cf12e7..041be3950 100755 --- a/.travis/install-dependencies.sh +++ b/.travis/install-dependencies.sh @@ -20,8 +20,7 @@ fi if [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "linux" ]]; then sudo apt-get update sudo apt-get install -y cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip - sudo pip install funcsigs colorama psutil redis tensorflow - sudo pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 + sudo pip install cloudpickle funcsigs colorama psutil redis tensorflow elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then sudo apt-get update sudo apt-get install -y cmake python-dev python-numpy build-essential autoconf curl libtool libboost-all-dev unzip @@ -29,8 +28,7 @@ elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh bash miniconda.sh -b -p $HOME/miniconda export PATH="$HOME/miniconda/bin:$PATH" - pip install numpy funcsigs colorama psutil redis tensorflow - pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 + pip install numpy cloudpickle funcsigs colorama psutil redis tensorflow elif [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "macosx" ]]; then # check that brew is installed which -s brew @@ -43,8 +41,7 @@ elif [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "macosx" ]]; then fi brew install cmake automake autoconf libtool boost sudo easy_install pip - sudo pip install numpy funcsigs colorama psutil redis tensorflow --ignore-installed six - sudo pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 + sudo pip install numpy cloudpickle funcsigs colorama psutil redis tensorflow --ignore-installed six elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then # check that brew is installed which -s brew @@ -60,8 +57,7 @@ elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh bash miniconda.sh -b -p $HOME/miniconda export PATH="$HOME/miniconda/bin:$PATH" - pip install numpy funcsigs colorama psutil redis tensorflow - pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 + pip install numpy cloudpickle funcsigs colorama psutil redis tensorflow else echo "Unrecognized environment." exit 1 diff --git a/doc/install-on-macosx.md b/doc/install-on-macosx.md index e96baede8..ab333cb7d 100644 --- a/doc/install-on-macosx.md +++ b/doc/install-on-macosx.md @@ -12,8 +12,7 @@ brew update brew install cmake automake autoconf libtool boost wget sudo easy_install pip # If you're using Anaconda, then this is unnecessary. -pip install numpy funcsigs colorama psutil redis --ignore-installed six -pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 # We use the latest version of cloudpickle because it can serialize named tuples. +pip install numpy cloudpickle funcsigs colorama psutil redis --ignore-installed six pip install --upgrade --verbose "git+git://github.com/ray-project/ray.git#egg=numbuf&subdirectory=numbuf" ``` diff --git a/doc/install-on-ubuntu.md b/doc/install-on-ubuntu.md index a8fd62636..b5af97e2c 100644 --- a/doc/install-on-ubuntu.md +++ b/doc/install-on-ubuntu.md @@ -12,8 +12,7 @@ To install Ray, first install the following dependencies. We recommend using sudo apt-get update sudo apt-get install -y cmake build-essential autoconf curl libtool python-dev python-pip libboost-all-dev unzip # If you're using Anaconda, then python-dev and python-pip are unnecessary. -pip install numpy funcsigs colorama psutil redis -pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4 # We use the latest version of cloudpickle because it can serialize named tuples. +pip install numpy cloudpickle funcsigs colorama psutil redis pip install --upgrade --verbose "git+git://github.com/ray-project/ray.git#egg=numbuf&subdirectory=numbuf" ``` diff --git a/docker/base-deps/Dockerfile b/docker/base-deps/Dockerfile index f193dccad..310ac5785 100644 --- a/docker/base-deps/Dockerfile +++ b/docker/base-deps/Dockerfile @@ -14,5 +14,4 @@ RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh \ ENV PATH "/opt/conda/bin:$PATH" RUN conda install libgcc RUN pip install --upgrade pip -RUN pip install --upgrade "git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4" RUN pip install --upgrade --verbose "git+git://github.com/ray-project/ray.git#egg=numbuf&subdirectory=numbuf" diff --git a/lib/python/MANIFEST.in b/lib/python/MANIFEST.in deleted file mode 100644 index 8708b58cb..000000000 --- a/lib/python/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -recursive-include webui * diff --git a/lib/python/setup.py b/lib/python/setup.py index df251d119..08ab1b10c 100644 --- a/lib/python/setup.py +++ b/lib/python/setup.py @@ -33,7 +33,7 @@ setup(name="ray", "colorama", "psutil", "redis", - "cloudpickle"], + "cloudpickle >= 0.2.2"], include_package_data=True, zip_safe=False, license="Apache 2.0") diff --git a/src/common/lib/python/setup.py b/src/common/lib/python/setup.py index 2f9f19436..db861593b 100644 --- a/src/common/lib/python/setup.py +++ b/src/common/lib/python/setup.py @@ -7,6 +7,6 @@ common_module = Extension("common", extra_compile_args=["--std=c99", "-Werror"]) setup(name="Common", - version="0.01", + version="0.0.1", description="Common library for Ray", ext_modules=[common_module]) diff --git a/test/runtest.py b/test/runtest.py index fd87ccc63..5faa44ac1 100644 --- a/test/runtest.py +++ b/test/runtest.py @@ -123,7 +123,7 @@ try: import cloudpickle cloudpickle.dumps(Point) except AttributeError: - cloudpickle_command = "sudo pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4" + cloudpickle_command = "pip install --upgrade git+git://github.com/cloudpipe/cloudpickle.git@0d225a4695f1f65ae1cbb2e0bbc145e10167cce4" raise Exception("You have an older version of cloudpickle that is not able to serialize namedtuples. Try running \n\n{}\n\n".format(cloudpickle_command)) class SerializationTest(unittest.TestCase):