From 1a1324d2a250ad4b1cfa0ee585c320bdadabe832 Mon Sep 17 00:00:00 2001 From: Eric Liang Date: Mon, 16 Dec 2019 23:57:42 -0800 Subject: [PATCH] Bump version from 0.8.0.dev6 -> 0.9.0.dev (#6508) --- ci/long_running_tests/ray-project/project.yaml | 2 +- ci/travis/build-autoscaler-images.sh | 2 +- doc/dev/RELEASE_PROCESS.rst | 16 ++++------------ doc/examples/newsreader/ray-project/cluster.yaml | 2 +- doc/source/installation.rst | 16 ++++++++-------- docker/stress_test/Dockerfile | 2 +- docker/tune_test/Dockerfile | 2 +- python/ray/__init__.py | 2 +- python/ray/autoscaler/aws/example-full.yaml | 6 +++--- .../ray/autoscaler/aws/example-gpu-docker.yaml | 6 +++--- python/ray/autoscaler/gcp/example-full.yaml | 6 +++--- .../ray/autoscaler/gcp/example-gpu-docker.yaml | 6 +++--- .../experimental/sgd/examples/example-sgd.yaml | 2 +- .../sgd/examples/tf-example-sgd.yaml | 2 +- src/ray/raylet/main.cc | 2 +- 15 files changed, 33 insertions(+), 41 deletions(-) diff --git a/ci/long_running_tests/ray-project/project.yaml b/ci/long_running_tests/ray-project/project.yaml index 58c0a4f1c..11153d456 100644 --- a/ci/long_running_tests/ray-project/project.yaml +++ b/ci/long_running_tests/ray-project/project.yaml @@ -16,7 +16,7 @@ commands: params: - name: wheel help: "URL to the ray wheel to test (defaults to latest)." - default: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl + default: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl - name: workload help: "Name of the workload to run." choices: ["actor_deaths", "apex", "impala", "many_actor_tasks", "many_drivers", "many_tasks", "node_failures", "pbt"] diff --git a/ci/travis/build-autoscaler-images.sh b/ci/travis/build-autoscaler-images.sh index 95b45cbdd..9b87e0996 100755 --- a/ci/travis/build-autoscaler-images.sh +++ b/ci/travis/build-autoscaler-images.sh @@ -13,7 +13,7 @@ if [[ "$TRAVIS" == "true" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then docker build -q -t rayproject/base-deps docker/base-deps - wheel="ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl" + wheel="ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl" commit_sha=$(echo $TRAVIS_COMMIT | head -c 6) cp -r $ROOT_DIR/.whl $ROOT_DIR/docker/autoscaler/.whl diff --git a/doc/dev/RELEASE_PROCESS.rst b/doc/dev/RELEASE_PROCESS.rst index 46763c67f..a6c6103b5 100644 --- a/doc/dev/RELEASE_PROCESS.rst +++ b/doc/dev/RELEASE_PROCESS.rst @@ -14,23 +14,15 @@ This document describes the process for creating new releases. python/ray/__init__.py and src/ray/raylet/main.cc. See this `sample commit for bumping the release branch version`_. -3. **Update the master branch version:** Create a pull request to +3. **Update the master branch version:** + + For a new minor release (e.g., 0.7.0): Create a pull request to increment the dev version in of the master branch. See this `sample PR for bumping a minor release version`_. **NOTE:** Not all of the version numbers should be replaced. For example, ``0.7.0`` appears in this file but should not be updated. - This should be merged soon after cutting the release branch (step 1) to - closely track the development version. - - For a new micro release (e.g., 0.7.1): Increment the ``dev`` number, such that the - number after ``dev`` equals the micro version. For example, if the version - of the new release is 0.7.1, the master branch needs to be updated to - 0.8.0.dev1. - - For a new minor release (e.g., 0.7.0): Increment the minor version and append - ``.dev0`` to the version. For example, if the new release is 0.7.0, - the master branch should be updated to 0.8.0.dev0. + For a new micro release (e.g., 0.7.1): No action is required. 4. **Testing:** Before releasing, the following sets of tests should be run. The results of each of these tests for previous releases are checked in under ``doc/dev/release_tests``, diff --git a/doc/examples/newsreader/ray-project/cluster.yaml b/doc/examples/newsreader/ray-project/cluster.yaml index 907341f1c..58150bd0e 100644 --- a/doc/examples/newsreader/ray-project/cluster.yaml +++ b/doc/examples/newsreader/ray-project/cluster.yaml @@ -24,7 +24,7 @@ setup_commands: - echo 'export PATH="$HOME/anaconda3/bin:$PATH"' >> ~/.bashrc - sudo apt -y update - sudo apt -y install npm - - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl + - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl # How Ray will authenticate with newly launched nodes. auth: diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 2e6269622..3ba1a8d74 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -34,14 +34,14 @@ master branch). To install these wheels, run the following command: =================== =================== -.. _`Linux Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp37-cp37m-manylinux1_x86_64.whl -.. _`Linux Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl -.. _`Linux Python 3.5`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp35-cp35m-manylinux1_x86_64.whl -.. _`Linux Python 2.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp27-cp27mu-manylinux1_x86_64.whl -.. _`MacOS Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp37-cp37m-macosx_10_6_intel.whl -.. _`MacOS Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-macosx_10_6_intel.whl -.. _`MacOS Python 3.5`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp35-cp35m-macosx_10_6_intel.whl -.. _`MacOS Python 2.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp27-cp27m-macosx_10_6_intel.whl +.. _`Linux Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp37-cp37m-manylinux1_x86_64.whl +.. _`Linux Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl +.. _`Linux Python 3.5`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp35-cp35m-manylinux1_x86_64.whl +.. _`Linux Python 2.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp27-cp27mu-manylinux1_x86_64.whl +.. _`MacOS Python 3.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp37-cp37m-macosx_10_6_intel.whl +.. _`MacOS Python 3.6`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-macosx_10_6_intel.whl +.. _`MacOS Python 3.5`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp35-cp35m-macosx_10_6_intel.whl +.. _`MacOS Python 2.7`: https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp27-cp27m-macosx_10_6_intel.whl Installing Ray with Anaconda ---------------------------- diff --git a/docker/stress_test/Dockerfile b/docker/stress_test/Dockerfile index 5cb6d3293..111535632 100644 --- a/docker/stress_test/Dockerfile +++ b/docker/stress_test/Dockerfile @@ -4,7 +4,7 @@ FROM ray-project/base-deps # We install ray and boto3 to enable the ray autoscaler as # a test runner. -RUN pip install -U https://ray-wheels.s3-us-west-2.amazonaws.com/latest/ray-0.8.0.dev5-cp36-cp36m-manylinux1_x86_64.whl boto3 +RUN pip install -U https://ray-wheels.s3-us-west-2.amazonaws.com/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl boto3 RUN mkdir -p /root/.ssh/ # We port the source code in so that we run the most up-to-date stress tests. diff --git a/docker/tune_test/Dockerfile b/docker/tune_test/Dockerfile index c6a9062f2..c90245cd2 100644 --- a/docker/tune_test/Dockerfile +++ b/docker/tune_test/Dockerfile @@ -6,7 +6,7 @@ FROM ray-project/base-deps # a test runner. RUN conda install -y numpy RUN pip install -U pip -RUN pip install -U https://ray-wheels.s3-us-west-2.amazonaws.com/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl || pip install -U https://ray-wheels.s3-us-west-2.amazonaws.com/latest/ray-0.8.0.dev6-cp36-cp36m-manylinux1_x86_64.whl +RUN pip install -U https://ray-wheels.s3-us-west-2.amazonaws.com/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl RUN pip install -U boto3 # We install this after the latest wheels -- this should not override the latest wheels. # Needed to run Tune example with a 'plot' call - which does not actually render a plot, but throws an error. diff --git a/python/ray/__init__.py b/python/ray/__init__.py index 336704025..3452464c1 100644 --- a/python/ray/__init__.py +++ b/python/ray/__init__.py @@ -132,7 +132,7 @@ from ray.actor import method # noqa: E402 from ray.runtime_context import _get_runtime_context # noqa: E402 # Ray version string. -__version__ = "0.8.0.dev7" +__version__ = "0.9.0.dev" __all__ = [ "global_state", diff --git a/python/ray/autoscaler/aws/example-full.yaml b/python/ray/autoscaler/aws/example-full.yaml index 5d16efffe..6248b6e22 100644 --- a/python/ray/autoscaler/aws/example-full.yaml +++ b/python/ray/autoscaler/aws/example-full.yaml @@ -116,9 +116,9 @@ setup_commands: # has your Ray repo pre-cloned. Then, you can replace the pip installs # below with a git checkout (and possibly a recompile). - echo 'export PATH="$HOME/anaconda3/envs/tensorflow_p36/bin:$PATH"' >> ~/.bashrc - # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp27-cp27mu-manylinux1_x86_64.whl - # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp35-cp35m-manylinux1_x86_64.whl - - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl + # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp27-cp27mu-manylinux1_x86_64.whl + # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp35-cp35m-manylinux1_x86_64.whl + - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl # Consider uncommenting these if you also want to run apt-get commands during setup # - sudo pkill -9 apt-get || true # - sudo pkill -9 dpkg || true diff --git a/python/ray/autoscaler/aws/example-gpu-docker.yaml b/python/ray/autoscaler/aws/example-gpu-docker.yaml index bb603e2fc..68e541a9b 100644 --- a/python/ray/autoscaler/aws/example-gpu-docker.yaml +++ b/python/ray/autoscaler/aws/example-gpu-docker.yaml @@ -105,9 +105,9 @@ file_mounts: { # List of shell commands to run to set up nodes. setup_commands: - # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp27-cp27mu-manylinux1_x86_64.whl - - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp35-cp35m-manylinux1_x86_64.whl - # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl + # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp27-cp27mu-manylinux1_x86_64.whl + - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp35-cp35m-manylinux1_x86_64.whl + # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl # Custom commands that will be run on the head node after common setup. head_setup_commands: diff --git a/python/ray/autoscaler/gcp/example-full.yaml b/python/ray/autoscaler/gcp/example-full.yaml index fadf45759..c6fea03b9 100644 --- a/python/ray/autoscaler/gcp/example-full.yaml +++ b/python/ray/autoscaler/gcp/example-full.yaml @@ -130,9 +130,9 @@ setup_commands: && echo 'export PATH="$HOME/anaconda3/bin:$PATH"' >> ~/.profile # Install ray - # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp27-cp27mu-manylinux1_x86_64.whl - # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp35-cp35m-manylinux1_x86_64.whl - - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl + # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp27-cp27mu-manylinux1_x86_64.whl + # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp35-cp35m-manylinux1_x86_64.whl + - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl # Custom commands that will be run on the head node after common setup. diff --git a/python/ray/autoscaler/gcp/example-gpu-docker.yaml b/python/ray/autoscaler/gcp/example-gpu-docker.yaml index 7deb7b5ec..6970b3934 100644 --- a/python/ray/autoscaler/gcp/example-gpu-docker.yaml +++ b/python/ray/autoscaler/gcp/example-gpu-docker.yaml @@ -140,9 +140,9 @@ setup_commands: # - echo 'export PATH="$HOME/anaconda3/envs/tensorflow_p36/bin:$PATH"' >> ~/.bashrc # Install ray - # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp27-cp27mu-manylinux1_x86_64.whl - - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp35-cp35m-manylinux1_x86_64.whl - # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl + # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp27-cp27mu-manylinux1_x86_64.whl + - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp35-cp35m-manylinux1_x86_64.whl + # - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl # Custom commands that will be run on the head node after common setup. head_setup_commands: diff --git a/python/ray/experimental/sgd/examples/example-sgd.yaml b/python/ray/experimental/sgd/examples/example-sgd.yaml index 9b0a581a4..cf77893c4 100644 --- a/python/ray/experimental/sgd/examples/example-sgd.yaml +++ b/python/ray/experimental/sgd/examples/example-sgd.yaml @@ -47,7 +47,7 @@ worker_nodes: # MarketType: spot setup_commands: - - ray || pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev7-cp36-cp36m-manylinux1_x86_64.whl + - ray || pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl - pip install -U ipdb ray[rllib] torch torchvision diff --git a/python/ray/experimental/sgd/examples/tf-example-sgd.yaml b/python/ray/experimental/sgd/examples/tf-example-sgd.yaml index 6b5bb7ddb..2edf5d7d1 100644 --- a/python/ray/experimental/sgd/examples/tf-example-sgd.yaml +++ b/python/ray/experimental/sgd/examples/tf-example-sgd.yaml @@ -48,7 +48,7 @@ worker_nodes: setup_commands: - conda install setuptools=41.0.1=py36_0 wrapt=1.11.2 --yes # workaround to fix wrapt error - - ray || pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.8.0.dev3-cp36-cp36m-manylinux1_x86_64.whl + - ray || pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.9.0.dev-cp36-cp36m-manylinux1_x86_64.whl - pip install -U ipdb ray[rllib] - pip install tensorflow==2.0.0-rc0 diff --git a/src/ray/raylet/main.cc b/src/ray/raylet/main.cc index 2a2405ae1..d292dec44 100644 --- a/src/ray/raylet/main.cc +++ b/src/ray/raylet/main.cc @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) { // Initialize stats. const ray::stats::TagsType global_tags = { {ray::stats::JobNameKey, "raylet"}, - {ray::stats::VersionKey, "0.8.0.dev7"}, + {ray::stats::VersionKey, "0.9.0.dev"}, {ray::stats::NodeAddressKey, node_ip_address}}; ray::stats::Init(stat_address, global_tags, disable_stats, enable_stdout_exporter);