[ci] sorting requirements and constraints for raydepsets (ray-project#58414)

Sorting requirements and constraints for raydepsets

---------

Signed-off-by: elliot-barn <elliot.barnwell@anyscale.com>
Signed-off-by: YK <1811651+ykdojo@users.noreply.github.com>

Author: elliot-barn

ci/raydepsets/cli.py

@@ -318,10 +318,10 @@ def compile(
         if append_flags:
             args.extend(_flatten_flags(append_flags))
         if constraints:
-            for constraint in constraints:
+            for constraint in sorted(constraints):
                 args.extend(["-c", constraint])
         if requirements:
-            for requirement in requirements:
+            for requirement in sorted(requirements):
                 args.extend([requirement])
         if packages:
             # need to add a dash to process stdin

ci/raydepsets/tests/test_cli.py

@@ -712,6 +712,66 @@ def test_compile_with_packages_and_requirements(self):
             output_text_valid = output_file_valid.read_text()
             assert output_text == output_text_valid
 
+    @patch("sys.stdout", new_callable=io.StringIO)
+    def test_requirements_ordering(self, mock_stdout):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            copy_data_to_tmpdir(tmpdir)
+            save_packages_to_file(
+                Path(tmpdir) / "requirements_expanded.txt",
+                ["six"],
+            )
+            save_packages_to_file(
+                Path(tmpdir) / "requirements_compiled_test_expand.txt",
+                ["zipp"],
+            )
+            manager = _create_test_manager(tmpdir)
+            manager.compile(
+                constraints=["requirement_constraints_test.txt"],
+                requirements=[
+                    "requirements_test.txt",
+                    "requirements_expanded.txt",
+                    "requirements_compiled_test_expand.txt",
+                ],
+                append_flags=["--no-annotate", "--no-header"],
+                name="requirements_ordering_test_depset",
+                output="requirements_compiled_requirements_ordering.txt",
+            )
+            stdout = mock_stdout.getvalue()
+            assert (
+                "requirements_compiled_test_expand.txt requirements_expanded.txt requirements_test.txt"
+                in stdout
+            )
+
+    @patch("sys.stdout", new_callable=io.StringIO)
+    def test_constraints_ordering(self, mock_stdout):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            copy_data_to_tmpdir(tmpdir)
+            save_packages_to_file(
+                Path(tmpdir) / "requirements_expanded.txt",
+                ["six==1.17.0"],
+            )
+            save_packages_to_file(
+                Path(tmpdir) / "requirements_compiled_test_expand.txt",
+                ["zipp==3.19.2"],
+            )
+            manager = _create_test_manager(tmpdir)
+            manager.compile(
+                requirements=["requirements_test.txt"],
+                constraints=[
+                    "requirement_constraints_test.txt",
+                    "requirements_expanded.txt",
+                    "requirements_compiled_test_expand.txt",
+                ],
+                append_flags=["--no-annotate", "--no-header"],
+                name="constraints_ordering_test_depset",
+                output="requirements_compiled_constraints_ordering.txt",
+            )
+            stdout = mock_stdout.getvalue()
+            assert (
+                "-c requirement_constraints_test.txt -c requirements_compiled_test_expand.txt -c requirements_expanded.txt"
+                in stdout
+            )
+
     @patch("sys.stdout", new_callable=io.StringIO)
     def test_execute_pre_hook(self, mock_stdout):
         with tempfile.TemporaryDirectory() as tmpdir:

python/deplocks/llm/ray_test_py311_cpu.lock

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.11 --unsafe-package ray --python-platform=linux --extra-index-url https://download.pytorch.org/whl/cpu -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt -o python/deplocks/llm/ray_test_py311_cpu.lock
+#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.11 --unsafe-package ray --python-platform=linux --extra-index-url https://download.pytorch.org/whl/cpu -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/base-test-requirements.txt python/requirements/cloud-requirements.txt -o python/deplocks/llm/ray_test_py311_cpu.lock
 --index-url https://pypi.org/simple
 --extra-index-url https://download.pytorch.org/whl/cpu
 

python/deplocks/llm/ray_test_py311_cu128.lock

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.11 --unsafe-package ray --python-platform=linux --extra-index-url https://download.pytorch.org/whl/cu128 -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt -o python/deplocks/llm/ray_test_py311_cu128.lock
+#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.11 --unsafe-package ray --python-platform=linux --extra-index-url https://download.pytorch.org/whl/cu128 -c /tmp/ray-deps/requirements_compiled.txt python/requirements.txt python/requirements/base-test-requirements.txt python/requirements/cloud-requirements.txt -o python/deplocks/llm/ray_test_py311_cu128.lock
 --index-url https://pypi.org/simple
 --extra-index-url https://download.pytorch.org/whl/cu128
 

python/deplocks/llm/rayllm_test_py311_cpu.lock

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.11 --unsafe-package ray --python-platform=linux --extra-index-url https://download.pytorch.org/whl/cpu -c python/deplocks/llm/ray_test_py311_cpu.lock python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/deplocks/llm/rayllm_test_py311_cpu.lock
+#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.11 --unsafe-package ray --python-platform=linux --extra-index-url https://download.pytorch.org/whl/cpu -c python/deplocks/llm/ray_test_py311_cpu.lock python/requirements.txt python/requirements/base-test-requirements.txt python/requirements/cloud-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/deplocks/llm/rayllm_test_py311_cpu.lock
 --index-url https://pypi.org/simple
 --extra-index-url https://download.pytorch.org/whl/cpu
 

python/deplocks/llm/rayllm_test_py311_cu128.lock

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.11 --unsafe-package ray --python-platform=linux --extra-index-url https://download.pytorch.org/whl/cu128 -c python/deplocks/llm/ray_test_py311_cu128.lock python/requirements.txt python/requirements/cloud-requirements.txt python/requirements/base-test-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/deplocks/llm/rayllm_test_py311_cu128.lock
+#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.11 --unsafe-package ray --python-platform=linux --extra-index-url https://download.pytorch.org/whl/cu128 -c python/deplocks/llm/ray_test_py311_cu128.lock python/requirements.txt python/requirements/base-test-requirements.txt python/requirements/cloud-requirements.txt python/requirements/llm/llm-requirements.txt python/requirements/llm/llm-test-requirements.txt -o python/deplocks/llm/rayllm_test_py311_cu128.lock
 --index-url https://pypi.org/simple
 --extra-index-url https://download.pytorch.org/whl/cu128
 

release/ray_release/byod/audio_transcription_py3.10.lock

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.10 --unsafe-package ray --python-platform=linux release/ray_release/byod/ray_dev_py3.10.in docker/base-deps/requirements.in docker/base-extra/requirements.in release/nightly_tests/multimodal_inference_benchmarks/audio_transcription/requirements.in -o release/ray_release/byod/audio_transcription_py3.10.lock
+#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.10 --unsafe-package ray --python-platform=linux docker/base-deps/requirements.in docker/base-extra/requirements.in release/nightly_tests/multimodal_inference_benchmarks/audio_transcription/requirements.in release/ray_release/byod/ray_dev_py3.10.in -o release/ray_release/byod/audio_transcription_py3.10.lock
 --index-url https://pypi.org/simple
 
 absl-py==1.4.0 \

release/ray_release/byod/audio_transcription_py3.9.lock

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.9 --unsafe-package ray --python-platform=linux release/ray_release/byod/ray_dev_py3.9.in docker/base-deps/requirements.in docker/base-extra/requirements.in release/nightly_tests/multimodal_inference_benchmarks/audio_transcription/requirements.in -o release/ray_release/byod/audio_transcription_py3.9.lock
+#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --python-version=3.9 --unsafe-package ray --python-platform=linux docker/base-deps/requirements.in docker/base-extra/requirements.in release/nightly_tests/multimodal_inference_benchmarks/audio_transcription/requirements.in release/ray_release/byod/ray_dev_py3.9.in -o release/ray_release/byod/audio_transcription_py3.9.lock
 --index-url https://pypi.org/simple
 
 accelerate==1.10.1 \

release/ray_release/byod/ray_base_extra_testdeps_cuda_py3.10.lock

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --unsafe-package ray --python-version=3.10 --python-platform=linux -c /tmp/ray-deps/requirements_compiled.txt release/ray_release/byod/ray_dev_py3.10.in release/ray_release/byod/requirements_byod_3.10.in docker/base-deps/requirements.in docker/base-extra/requirements.in -o release/ray_release/byod/ray_base_extra_testdeps_cuda_py3.10.lock
+#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --unsafe-package ray --python-version=3.10 --python-platform=linux -c /tmp/ray-deps/requirements_compiled.txt docker/base-deps/requirements.in docker/base-extra/requirements.in release/ray_release/byod/ray_dev_py3.10.in release/ray_release/byod/requirements_byod_3.10.in -o release/ray_release/byod/ray_base_extra_testdeps_cuda_py3.10.lock
 --index-url https://pypi.org/simple
 --extra-index-url https://download.pytorch.org/whl/cu128
 

release/ray_release/byod/ray_base_extra_testdeps_cuda_py3.11.lock

@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --unsafe-package ray --python-version=3.11 --python-platform=linux -c /tmp/ray-deps/requirements_compiled.txt release/ray_release/byod/ray_dev_py3.11.in release/ray_release/byod/requirements_byod_3.11.in docker/base-deps/requirements.in docker/base-extra/requirements.in -o release/ray_release/byod/ray_base_extra_testdeps_cuda_py3.11.lock
+#    uv pip compile --generate-hashes --strip-extras --unsafe-package setuptools --index-url https://pypi.org/simple --index-strategy unsafe-best-match --no-strip-markers --emit-index-url --emit-find-links --extra-index-url https://download.pytorch.org/whl/cu128 --unsafe-package ray --python-version=3.11 --python-platform=linux -c /tmp/ray-deps/requirements_compiled.txt docker/base-deps/requirements.in docker/base-extra/requirements.in release/ray_release/byod/ray_dev_py3.11.in release/ray_release/byod/requirements_byod_3.11.in -o release/ray_release/byod/ray_base_extra_testdeps_cuda_py3.11.lock
 --index-url https://pypi.org/simple
 --extra-index-url https://download.pytorch.org/whl/cu128