From dd27bfbb753ae23648a2ffc777cca708a88d5725 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Thu, 5 Dec 2019 16:15:42 -0800 Subject: [PATCH] Rename .rayproject to ray-project (#6278) --- ci/long_running_tests/README.rst | 2 +- .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 2 +- .../cython/{.rayproject => ray-project}/cluster.yaml | 0 .../cython/{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 .../lbfgs/{.rayproject => ray-project}/cluster.yaml | 0 .../lbfgs/{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 doc/source/projects.rst | 10 +++++----- .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 python/ray/projects/projects.py | 12 ++++++------ python/ray/projects/scripts.py | 4 ++-- .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 2 +- .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 2 +- .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 6 +++--- .../{.rayproject => ray-project}/requirements.txt | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 4 ++-- .../{.rayproject => ray-project}/requirements.txt | 0 .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 2 +- .../{.rayproject => ray-project}/cluster.yaml | 0 .../{.rayproject => ray-project}/project.yaml | 0 50 files changed, 39 insertions(+), 39 deletions(-) rename ci/long_running_tests/{.rayproject => ray-project}/cluster.yaml (100%) rename ci/long_running_tests/{.rayproject => ray-project}/project.yaml (97%) rename doc/examples/cython/{.rayproject => ray-project}/cluster.yaml (100%) rename doc/examples/cython/{.rayproject => ray-project}/project.yaml (94%) rename doc/examples/cython/{.rayproject => ray-project}/requirements.txt (100%) rename doc/examples/lbfgs/{.rayproject => ray-project}/cluster.yaml (100%) rename doc/examples/lbfgs/{.rayproject => ray-project}/project.yaml (85%) rename doc/examples/lbfgs/{.rayproject => ray-project}/requirements.txt (100%) rename doc/examples/newsreader/{.rayproject => ray-project}/cluster.yaml (100%) rename doc/examples/newsreader/{.rayproject => ray-project}/project.yaml (89%) rename doc/examples/newsreader/{.rayproject => ray-project}/requirements.txt (100%) rename doc/examples/parameter_server/{.rayproject => ray-project}/cluster.yaml (100%) rename doc/examples/parameter_server/{.rayproject => ray-project}/project.yaml (92%) rename doc/examples/parameter_server/{.rayproject => ray-project}/requirements.txt (100%) rename doc/examples/streaming/{.rayproject => ray-project}/cluster.yaml (100%) rename doc/examples/streaming/{.rayproject => ray-project}/project.yaml (90%) rename doc/examples/streaming/{.rayproject => ray-project}/requirements.txt (100%) rename python/ray/projects/examples/open-tacotron/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/projects/examples/open-tacotron/{.rayproject => ray-project}/project.yaml (85%) rename python/ray/projects/examples/open-tacotron/{.rayproject => ray-project}/requirements.txt (100%) rename python/ray/projects/examples/pytorch-transformers/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/projects/examples/pytorch-transformers/{.rayproject => ray-project}/project.yaml (93%) rename python/ray/projects/examples/pytorch-transformers/{.rayproject => ray-project}/requirements.txt (100%) rename python/ray/tests/project_files/docker_project/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/docker_project/{.rayproject => ray-project}/project.yaml (100%) rename python/ray/tests/project_files/no_project1/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/no_project1/{.rayproject => ray-project}/project.yaml (100%) rename python/ray/tests/project_files/project1/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/project1/{.rayproject => ray-project}/project.yaml (76%) rename python/ray/tests/project_files/requirements_project/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/requirements_project/{.rayproject => ray-project}/project.yaml (100%) rename python/ray/tests/project_files/session-tests/commands-test/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/session-tests/commands-test/{.rayproject => ray-project}/project.yaml (94%) rename python/ray/tests/project_files/session-tests/git-repo-pass/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/session-tests/git-repo-pass/{.rayproject => ray-project}/project.yaml (86%) rename python/ray/tests/project_files/session-tests/git-repo-pass/{.rayproject => ray-project}/requirements.txt (100%) rename python/ray/tests/project_files/session-tests/invalid-config-fail/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/session-tests/invalid-config-fail/{.rayproject => ray-project}/project.yaml (88%) rename python/ray/tests/project_files/session-tests/invalid-config-fail/{.rayproject => ray-project}/requirements.txt (100%) rename python/ray/tests/project_files/session-tests/project-pass/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/session-tests/project-pass/{.rayproject => ray-project}/project.yaml (86%) rename python/ray/tests/project_files/session-tests/project-pass/{.rayproject => ray-project}/requirements.txt (100%) rename python/ray/tests/project_files/session-tests/with-docker-fail/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/session-tests/with-docker-fail/{.rayproject => ray-project}/project.yaml (93%) rename python/ray/tests/project_files/shell_project/{.rayproject => ray-project}/cluster.yaml (100%) rename python/ray/tests/project_files/shell_project/{.rayproject => ray-project}/project.yaml (100%) diff --git a/ci/long_running_tests/README.rst b/ci/long_running_tests/README.rst index c99065ed9..1c1389447 100644 --- a/ci/long_running_tests/README.rst +++ b/ci/long_running_tests/README.rst @@ -49,4 +49,4 @@ Adding a Workload ----------------- To create a new workload, simply add a new Python file under ``workloads/`` and -add the workload in the run command in `.rayproject/project.yaml`. +add the workload in the run command in `ray-project/project.yaml`. diff --git a/ci/long_running_tests/.rayproject/cluster.yaml b/ci/long_running_tests/ray-project/cluster.yaml similarity index 100% rename from ci/long_running_tests/.rayproject/cluster.yaml rename to ci/long_running_tests/ray-project/cluster.yaml diff --git a/ci/long_running_tests/.rayproject/project.yaml b/ci/long_running_tests/ray-project/project.yaml similarity index 97% rename from ci/long_running_tests/.rayproject/project.yaml rename to ci/long_running_tests/ray-project/project.yaml index a3f315ed0..44f2f5bd4 100644 --- a/ci/long_running_tests/.rayproject/project.yaml +++ b/ci/long_running_tests/ray-project/project.yaml @@ -1,7 +1,7 @@ name: long-running-tests description: "Ray's long running stress tests" -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml commands: - name: run diff --git a/doc/examples/cython/.rayproject/cluster.yaml b/doc/examples/cython/ray-project/cluster.yaml similarity index 100% rename from doc/examples/cython/.rayproject/cluster.yaml rename to doc/examples/cython/ray-project/cluster.yaml diff --git a/doc/examples/cython/.rayproject/project.yaml b/doc/examples/cython/ray-project/project.yaml similarity index 94% rename from doc/examples/cython/.rayproject/project.yaml rename to doc/examples/cython/ray-project/project.yaml index 70c3abf26..d83f0e799 100644 --- a/doc/examples/cython/.rayproject/project.yaml +++ b/doc/examples/cython/ray-project/project.yaml @@ -6,10 +6,10 @@ description: "Example of how to use Cython with ray" tags: ["ray-example", "cython"] documentation: https://ray.readthedocs.io/en/latest/advanced.html#cython-code-in-ray -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt shell: # Shell commands to be ran for environment setup. - pip install -e . diff --git a/doc/examples/cython/.rayproject/requirements.txt b/doc/examples/cython/ray-project/requirements.txt similarity index 100% rename from doc/examples/cython/.rayproject/requirements.txt rename to doc/examples/cython/ray-project/requirements.txt diff --git a/doc/examples/lbfgs/.rayproject/cluster.yaml b/doc/examples/lbfgs/ray-project/cluster.yaml similarity index 100% rename from doc/examples/lbfgs/.rayproject/cluster.yaml rename to doc/examples/lbfgs/ray-project/cluster.yaml diff --git a/doc/examples/lbfgs/.rayproject/project.yaml b/doc/examples/lbfgs/ray-project/project.yaml similarity index 85% rename from doc/examples/lbfgs/.rayproject/project.yaml rename to doc/examples/lbfgs/ray-project/project.yaml index 3fa7e0117..ac77c2b27 100644 --- a/doc/examples/lbfgs/.rayproject/project.yaml +++ b/doc/examples/lbfgs/ray-project/project.yaml @@ -6,10 +6,10 @@ description: "Parallelizing the L-BFGS algorithm in ray" tags: ["ray-example", "optimization", "lbfgs"] documentation: https://ray.readthedocs.io/en/latest/auto_examples/plot_lbfgs.html -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt commands: - name: run diff --git a/doc/examples/lbfgs/.rayproject/requirements.txt b/doc/examples/lbfgs/ray-project/requirements.txt similarity index 100% rename from doc/examples/lbfgs/.rayproject/requirements.txt rename to doc/examples/lbfgs/ray-project/requirements.txt diff --git a/doc/examples/newsreader/.rayproject/cluster.yaml b/doc/examples/newsreader/ray-project/cluster.yaml similarity index 100% rename from doc/examples/newsreader/.rayproject/cluster.yaml rename to doc/examples/newsreader/ray-project/cluster.yaml diff --git a/doc/examples/newsreader/.rayproject/project.yaml b/doc/examples/newsreader/ray-project/project.yaml similarity index 89% rename from doc/examples/newsreader/.rayproject/project.yaml rename to doc/examples/newsreader/ray-project/project.yaml index 55127ed17..b9fcebd83 100644 --- a/doc/examples/newsreader/.rayproject/project.yaml +++ b/doc/examples/newsreader/ray-project/project.yaml @@ -6,10 +6,10 @@ description: "A simple news reader example that uses ray actors to serve request tags: ["ray-example", "flask", "rss", "newsreader"] documentation: https://ray.readthedocs.io/en/latest/auto_examples/plot_newsreader.html -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt commands: - name: run-backend diff --git a/doc/examples/newsreader/.rayproject/requirements.txt b/doc/examples/newsreader/ray-project/requirements.txt similarity index 100% rename from doc/examples/newsreader/.rayproject/requirements.txt rename to doc/examples/newsreader/ray-project/requirements.txt diff --git a/doc/examples/parameter_server/.rayproject/cluster.yaml b/doc/examples/parameter_server/ray-project/cluster.yaml similarity index 100% rename from doc/examples/parameter_server/.rayproject/cluster.yaml rename to doc/examples/parameter_server/ray-project/cluster.yaml diff --git a/doc/examples/parameter_server/.rayproject/project.yaml b/doc/examples/parameter_server/ray-project/project.yaml similarity index 92% rename from doc/examples/parameter_server/.rayproject/project.yaml rename to doc/examples/parameter_server/ray-project/project.yaml index 3eb5955d4..bb1954f73 100644 --- a/doc/examples/parameter_server/.rayproject/project.yaml +++ b/doc/examples/parameter_server/ray-project/project.yaml @@ -6,10 +6,10 @@ description: "A simple parameter server example implemented with ray actors" tags: ["ray-example", "parameter-server", "machine-learning"] documentation: https://ray.readthedocs.io/en/latest/auto_examples/plot_parameter_server.html -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt commands: - name: run-sync diff --git a/doc/examples/parameter_server/.rayproject/requirements.txt b/doc/examples/parameter_server/ray-project/requirements.txt similarity index 100% rename from doc/examples/parameter_server/.rayproject/requirements.txt rename to doc/examples/parameter_server/ray-project/requirements.txt diff --git a/doc/examples/streaming/.rayproject/cluster.yaml b/doc/examples/streaming/ray-project/cluster.yaml similarity index 100% rename from doc/examples/streaming/.rayproject/cluster.yaml rename to doc/examples/streaming/ray-project/cluster.yaml diff --git a/doc/examples/streaming/.rayproject/project.yaml b/doc/examples/streaming/ray-project/project.yaml similarity index 90% rename from doc/examples/streaming/.rayproject/project.yaml rename to doc/examples/streaming/ray-project/project.yaml index 6983585b2..76db5b636 100644 --- a/doc/examples/streaming/.rayproject/project.yaml +++ b/doc/examples/streaming/ray-project/project.yaml @@ -5,10 +5,10 @@ name: ray-example-streaming description: "A simple ray example for a streaming wordcount" tags: ["ray-example", "streaming", "wordcount", "data-processing"] -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt commands: - name: run diff --git a/doc/examples/streaming/.rayproject/requirements.txt b/doc/examples/streaming/ray-project/requirements.txt similarity index 100% rename from doc/examples/streaming/.rayproject/requirements.txt rename to doc/examples/streaming/ray-project/requirements.txt diff --git a/doc/source/projects.rst b/doc/source/projects.rst index 8e13043fe..b7bdea8e2 100644 --- a/doc/source/projects.rst +++ b/doc/source/projects.rst @@ -13,12 +13,12 @@ Quick start (CLI) # Creates a project in the current directory. It will create a # project.yaml defining the code and environment and a cluster.yaml # describing the cluster configuration. Both will be created in the - # .rayproject subdirectory of the current directory. + # ray-project subdirectory of the current directory. $ ray project create # Create a new session from the given project. Launch a cluster and run # the command, which must be specified in the project.yaml file. If no - # command is specified, the "default" command in .rayproject/project.yaml + # command is specified, the "default" command in ray-project/project.yaml # will be used. Alternatively, use --shell to run a raw shell command. $ ray session start [arguments] [--shell] @@ -33,9 +33,9 @@ Examples See `the readme `__ for instructions on how to run these examples: -- `Open Tacotron `__: +- `Open Tacotron `__: A TensorFlow implementation of Google's Tacotron speech synthesis with pre-trained model (unofficial) -- `PyTorch Transformers `__: +- `PyTorch Transformers `__: A library of state-of-the-art pretrained models for Natural Language Processing (NLP) Project file format (project.yaml) @@ -54,7 +54,7 @@ Here is an example for a minimal project format: repo: https://github.com/ray-project/ray # Cluster to be instantiated by default when starting the project. - cluster: .rayproject/cluster.yaml + cluster: ray-project/cluster.yaml # Commands/information to build the environment, once the cluster is # instantiated. This can include the versions of python libraries etc. diff --git a/python/ray/projects/examples/open-tacotron/.rayproject/cluster.yaml b/python/ray/projects/examples/open-tacotron/ray-project/cluster.yaml similarity index 100% rename from python/ray/projects/examples/open-tacotron/.rayproject/cluster.yaml rename to python/ray/projects/examples/open-tacotron/ray-project/cluster.yaml diff --git a/python/ray/projects/examples/open-tacotron/.rayproject/project.yaml b/python/ray/projects/examples/open-tacotron/ray-project/project.yaml similarity index 85% rename from python/ray/projects/examples/open-tacotron/.rayproject/project.yaml rename to python/ray/projects/examples/open-tacotron/ray-project/project.yaml index 4aa268197..d703706d4 100644 --- a/python/ray/projects/examples/open-tacotron/.rayproject/project.yaml +++ b/python/ray/projects/examples/open-tacotron/ray-project/project.yaml @@ -4,10 +4,10 @@ name: open-tacotron description: "A TensorFlow implementation of Google's Tacotron speech synthesis with pre-trained model (unofficial)" repo: https://github.com/keithito/tacotron -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt shell: - curl http://data.keithito.com/data/speech/tacotron-20180906.tar.gz | tar xzC /tmp diff --git a/python/ray/projects/examples/open-tacotron/.rayproject/requirements.txt b/python/ray/projects/examples/open-tacotron/ray-project/requirements.txt similarity index 100% rename from python/ray/projects/examples/open-tacotron/.rayproject/requirements.txt rename to python/ray/projects/examples/open-tacotron/ray-project/requirements.txt diff --git a/python/ray/projects/examples/pytorch-transformers/.rayproject/cluster.yaml b/python/ray/projects/examples/pytorch-transformers/ray-project/cluster.yaml similarity index 100% rename from python/ray/projects/examples/pytorch-transformers/.rayproject/cluster.yaml rename to python/ray/projects/examples/pytorch-transformers/ray-project/cluster.yaml diff --git a/python/ray/projects/examples/pytorch-transformers/.rayproject/project.yaml b/python/ray/projects/examples/pytorch-transformers/ray-project/project.yaml similarity index 93% rename from python/ray/projects/examples/pytorch-transformers/.rayproject/project.yaml rename to python/ray/projects/examples/pytorch-transformers/ray-project/project.yaml index bfac5525b..6506a3ef9 100644 --- a/python/ray/projects/examples/pytorch-transformers/.rayproject/project.yaml +++ b/python/ray/projects/examples/pytorch-transformers/ray-project/project.yaml @@ -4,10 +4,10 @@ name: pytorch-transformers description: "A library of state-of-the-art pretrained models for Natural Language Processing (NLP)" repo: https://github.com/huggingface/pytorch-transformers -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt commands: - name: train diff --git a/python/ray/projects/examples/pytorch-transformers/.rayproject/requirements.txt b/python/ray/projects/examples/pytorch-transformers/ray-project/requirements.txt similarity index 100% rename from python/ray/projects/examples/pytorch-transformers/.rayproject/requirements.txt rename to python/ray/projects/examples/pytorch-transformers/ray-project/requirements.txt diff --git a/python/ray/projects/projects.py b/python/ray/projects/projects.py index e99aadd6e..10bb13e13 100644 --- a/python/ray/projects/projects.py +++ b/python/ray/projects/projects.py @@ -12,10 +12,10 @@ import yaml class ProjectDefinition: def __init__(self, current_dir): - """Finds .rayproject folder for current project, parse and validates it. + """Finds ray-project folder for current project, parse and validates it. Args: - current_dir (str): Path from which to search for .rayproject. + current_dir (str): Path from which to search for ray-project. Raises: jsonschema.exceptions.ValidationError: This exception is raised @@ -31,7 +31,7 @@ class ProjectDefinition: self.root = os.path.join(root, "") # Parse the project YAML. - project_file = os.path.join(self.root, ".rayproject", "project.yaml") + project_file = os.path.join(self.root, "ray-project", "project.yaml") if not os.path.exists(project_file): raise ValueError("Project file {} not found".format(project_file)) with open(project_file) as f: @@ -127,12 +127,12 @@ def find_root(directory): directory (str): Directory to start the search in. Returns: - Path of the parent directory containing the .rayproject or + Path of the parent directory containing the ray-project or None if no such project is found. """ prev, directory = None, os.path.abspath(directory) while prev != directory: - if os.path.isdir(os.path.join(directory, ".rayproject")): + if os.path.isdir(os.path.join(directory, "ray-project")): return directory prev, directory = directory, os.path.abspath( os.path.join(directory, os.pardir)) @@ -160,7 +160,7 @@ def check_project_config(project_root, project_config): """Checks if the project definition is valid. Args: - project_root (str): Path containing the .rayproject + project_root (str): Path containing the ray-project project_config (dict): Project config definition Raises: diff --git a/python/ray/projects/scripts.py b/python/ray/projects/scripts.py index 94e2ae736..f2b67a38f 100644 --- a/python/ray/projects/scripts.py +++ b/python/ray/projects/scripts.py @@ -26,11 +26,11 @@ logger = logging.getLogger(__file__) # File layout for generated project files # user-dir/ -# .rayproject/ +# ray-project/ # project.yaml # cluster.yaml # requirements.txt -PROJECT_DIR = ".rayproject" +PROJECT_DIR = "ray-project" PROJECT_YAML = os.path.join(PROJECT_DIR, "project.yaml") CLUSTER_YAML = os.path.join(PROJECT_DIR, "cluster.yaml") REQUIREMENTS_TXT = os.path.join(PROJECT_DIR, "requirements.txt") diff --git a/python/ray/tests/project_files/docker_project/.rayproject/cluster.yaml b/python/ray/tests/project_files/docker_project/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/docker_project/.rayproject/cluster.yaml rename to python/ray/tests/project_files/docker_project/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/docker_project/.rayproject/project.yaml b/python/ray/tests/project_files/docker_project/ray-project/project.yaml similarity index 100% rename from python/ray/tests/project_files/docker_project/.rayproject/project.yaml rename to python/ray/tests/project_files/docker_project/ray-project/project.yaml diff --git a/python/ray/tests/project_files/no_project1/.rayproject/cluster.yaml b/python/ray/tests/project_files/no_project1/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/no_project1/.rayproject/cluster.yaml rename to python/ray/tests/project_files/no_project1/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/no_project1/.rayproject/project.yaml b/python/ray/tests/project_files/no_project1/ray-project/project.yaml similarity index 100% rename from python/ray/tests/project_files/no_project1/.rayproject/project.yaml rename to python/ray/tests/project_files/no_project1/ray-project/project.yaml diff --git a/python/ray/tests/project_files/project1/.rayproject/cluster.yaml b/python/ray/tests/project_files/project1/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/project1/.rayproject/cluster.yaml rename to python/ray/tests/project_files/project1/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/project1/.rayproject/project.yaml b/python/ray/tests/project_files/project1/ray-project/project.yaml similarity index 76% rename from python/ray/tests/project_files/project1/.rayproject/project.yaml rename to python/ray/tests/project_files/project1/ray-project/project.yaml index d6dd515b8..b47bca513 100644 --- a/python/ray/tests/project_files/project1/.rayproject/project.yaml +++ b/python/ray/tests/project_files/project1/ray-project/project.yaml @@ -1,6 +1,6 @@ name: "project1" -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: requirements: requirements.txt diff --git a/python/ray/tests/project_files/requirements_project/.rayproject/cluster.yaml b/python/ray/tests/project_files/requirements_project/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/requirements_project/.rayproject/cluster.yaml rename to python/ray/tests/project_files/requirements_project/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/requirements_project/.rayproject/project.yaml b/python/ray/tests/project_files/requirements_project/ray-project/project.yaml similarity index 100% rename from python/ray/tests/project_files/requirements_project/.rayproject/project.yaml rename to python/ray/tests/project_files/requirements_project/ray-project/project.yaml diff --git a/python/ray/tests/project_files/session-tests/commands-test/.rayproject/cluster.yaml b/python/ray/tests/project_files/session-tests/commands-test/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/session-tests/commands-test/.rayproject/cluster.yaml rename to python/ray/tests/project_files/session-tests/commands-test/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/session-tests/commands-test/.rayproject/project.yaml b/python/ray/tests/project_files/session-tests/commands-test/ray-project/project.yaml similarity index 94% rename from python/ray/tests/project_files/session-tests/commands-test/.rayproject/project.yaml rename to python/ray/tests/project_files/session-tests/commands-test/ray-project/project.yaml index c000ea81b..61deaa161 100644 --- a/python/ray/tests/project_files/session-tests/commands-test/.rayproject/project.yaml +++ b/python/ray/tests/project_files/session-tests/commands-test/ray-project/project.yaml @@ -5,7 +5,7 @@ name: commands-test # description: A short description of the project. repo: https://github.com/ray-project/not-exist -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: shell: diff --git a/python/ray/tests/project_files/session-tests/git-repo-pass/.rayproject/cluster.yaml b/python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/session-tests/git-repo-pass/.rayproject/cluster.yaml rename to python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/session-tests/git-repo-pass/.rayproject/project.yaml b/python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/project.yaml similarity index 86% rename from python/ray/tests/project_files/session-tests/git-repo-pass/.rayproject/project.yaml rename to python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/project.yaml index bbb8a39dc..242f5996a 100644 --- a/python/ray/tests/project_files/session-tests/git-repo-pass/.rayproject/project.yaml +++ b/python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/project.yaml @@ -5,12 +5,12 @@ name: git-repo-pass # description: A short description of the project. repo: https://github.com/ray-project/not-exist -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: # dockerfile: The dockerfile to be built and ran the commands with. # dockerimage: The docker image to be used to run the project in, e.g. ubuntu:18.04. - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt shell: # Shell commands to be ran for environment setup. - echo "Setting up the environment" diff --git a/python/ray/tests/project_files/session-tests/git-repo-pass/.rayproject/requirements.txt b/python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/requirements.txt similarity index 100% rename from python/ray/tests/project_files/session-tests/git-repo-pass/.rayproject/requirements.txt rename to python/ray/tests/project_files/session-tests/git-repo-pass/ray-project/requirements.txt diff --git a/python/ray/tests/project_files/session-tests/invalid-config-fail/.rayproject/cluster.yaml b/python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/session-tests/invalid-config-fail/.rayproject/cluster.yaml rename to python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/session-tests/invalid-config-fail/.rayproject/project.yaml b/python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/project.yaml similarity index 88% rename from python/ray/tests/project_files/session-tests/invalid-config-fail/.rayproject/project.yaml rename to python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/project.yaml index aaccd5614..783e51274 100644 --- a/python/ray/tests/project_files/session-tests/invalid-config-fail/.rayproject/project.yaml +++ b/python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/project.yaml @@ -5,15 +5,15 @@ name: invalid-config-fail # description: A short description of the project. # repo: The URL of the repo this project is part of. -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: # NOTE: The following is invalid because you can't have both dockerfile # and dockerimage dockerfile: The dockerfile to be built and ran the commands with. dockerimage: The docker image to be used to run the project in, e.g. ubuntu:18.04. - - requirements: .rayproject/requirements.txt + + requirements: ray-project/requirements.txt shell: # Shell commands to be ran for environment setup. - echo "Setting up the environment" diff --git a/python/ray/tests/project_files/session-tests/invalid-config-fail/.rayproject/requirements.txt b/python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/requirements.txt similarity index 100% rename from python/ray/tests/project_files/session-tests/invalid-config-fail/.rayproject/requirements.txt rename to python/ray/tests/project_files/session-tests/invalid-config-fail/ray-project/requirements.txt diff --git a/python/ray/tests/project_files/session-tests/project-pass/.rayproject/cluster.yaml b/python/ray/tests/project_files/session-tests/project-pass/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/session-tests/project-pass/.rayproject/cluster.yaml rename to python/ray/tests/project_files/session-tests/project-pass/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/session-tests/project-pass/.rayproject/project.yaml b/python/ray/tests/project_files/session-tests/project-pass/ray-project/project.yaml similarity index 86% rename from python/ray/tests/project_files/session-tests/project-pass/.rayproject/project.yaml rename to python/ray/tests/project_files/session-tests/project-pass/ray-project/project.yaml index dd64916e5..5db093a24 100644 --- a/python/ray/tests/project_files/session-tests/project-pass/.rayproject/project.yaml +++ b/python/ray/tests/project_files/session-tests/project-pass/ray-project/project.yaml @@ -5,12 +5,12 @@ name: project-pass # description: A short description of the project. # repo: The URL of the repo this project is part of. -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: # dockerfile: The dockerfile to be built and ran the commands with. # dockerimage: The docker image to be used to run the project in, e.g. ubuntu:18.04. - requirements: .rayproject/requirements.txt + requirements: ray-project/requirements.txt shell: # Shell commands to be ran for environment setup. - echo "Setting up the environment" diff --git a/python/ray/tests/project_files/session-tests/project-pass/.rayproject/requirements.txt b/python/ray/tests/project_files/session-tests/project-pass/ray-project/requirements.txt similarity index 100% rename from python/ray/tests/project_files/session-tests/project-pass/.rayproject/requirements.txt rename to python/ray/tests/project_files/session-tests/project-pass/ray-project/requirements.txt diff --git a/python/ray/tests/project_files/session-tests/with-docker-fail/.rayproject/cluster.yaml b/python/ray/tests/project_files/session-tests/with-docker-fail/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/session-tests/with-docker-fail/.rayproject/cluster.yaml rename to python/ray/tests/project_files/session-tests/with-docker-fail/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/session-tests/with-docker-fail/.rayproject/project.yaml b/python/ray/tests/project_files/session-tests/with-docker-fail/ray-project/project.yaml similarity index 93% rename from python/ray/tests/project_files/session-tests/with-docker-fail/.rayproject/project.yaml rename to python/ray/tests/project_files/session-tests/with-docker-fail/ray-project/project.yaml index 38b5e6509..841133b41 100644 --- a/python/ray/tests/project_files/session-tests/with-docker-fail/.rayproject/project.yaml +++ b/python/ray/tests/project_files/session-tests/with-docker-fail/ray-project/project.yaml @@ -5,7 +5,7 @@ name: with-docker-fail # description: A short description of the project. # repo: The URL of the repo this project is part of. -cluster: .rayproject/cluster.yaml +cluster: ray-project/cluster.yaml environment: # dockerfile: The dockerfile to be built and ran the commands with. diff --git a/python/ray/tests/project_files/shell_project/.rayproject/cluster.yaml b/python/ray/tests/project_files/shell_project/ray-project/cluster.yaml similarity index 100% rename from python/ray/tests/project_files/shell_project/.rayproject/cluster.yaml rename to python/ray/tests/project_files/shell_project/ray-project/cluster.yaml diff --git a/python/ray/tests/project_files/shell_project/.rayproject/project.yaml b/python/ray/tests/project_files/shell_project/ray-project/project.yaml similarity index 100% rename from python/ray/tests/project_files/shell_project/.rayproject/project.yaml rename to python/ray/tests/project_files/shell_project/ray-project/project.yaml