Skip to content

Commit

Permalink
Merge pull request #184 from regro-cf-autotick-bot/2.38.0_h046adf
Browse files Browse the repository at this point in the history
ray-packages v2.38.0
  • Loading branch information
mattip authored Oct 30, 2024
2 parents 1665fff + 3645823 commit 548b853
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 50 deletions.
38 changes: 0 additions & 38 deletions .ci_support/migrations/python312.yaml

This file was deleted.

1 change: 1 addition & 0 deletions recipe/build-core.bat
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ echo ==========================================================
cd python
rem This requires patch 0006
echo startup --output_user_root=D:/tmp >> ..\.bazelrc
echo build --jobs=1 >> ..\.bazelrc
"%PYTHON%" -m pip install . -vv

rem remember the return code
Expand Down
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "2.37.0" %}
{% set version = "2.38.0" %}

package:
name: ray-packages
version: {{ version }}

source:
url: https://github.com/ray-project/ray/archive/ray-{{ version }}.tar.gz
sha256: dcf92302ba813080003f33cb874912ee950331f2348822a2b615eb46f9baf0f8
sha256: 1579a974ef80eba0796be0fc95e4e7546cb1885cd682c50bf952f498618b8f04
patches:
- patches/0001-patch-redis-for-ar-ranlib.patch
- patches/0002-Disable-making-entry-scripts.patch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 79c291e9be8fdaf4364668d138a63e32dce6cfe2 Mon Sep 17 00:00:00 2001
From 3558dd639cc1f2af6cb9b7c62ed451a8fc7cef26 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Wed, 28 Aug 2024 09:25:55 +0300
Date: Thu, 24 Oct 2024 19:46:09 +0300
Subject: [PATCH] remove dependencies and third party package installs from
setup.py

Expand All @@ -9,10 +9,10 @@ Subject: [PATCH] remove dependencies and third party package installs from
1 file changed, 27 insertions(+), 129 deletions(-)

diff --git a/python/setup.py b/python/setup.py
index 0ae87994f8..2bb59bb944 100644
index 35cd57a70f..5d63dfe36b 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -225,113 +225,23 @@ ray_files += [
@@ -225,114 +225,23 @@ ray_files += [
# also update the matching section of requirements/requirements.txt
# in this directory
if setup_spec.type == SetupType.RAY:
Expand Down Expand Up @@ -91,6 +91,7 @@ index 0ae87994f8..2bb59bb944 100644
- + [
- "grpcio >= 1.32.0; python_version < '3.10'", # noqa:E501
- "grpcio >= 1.42.0; python_version >= '3.10'", # noqa:E501
- "pyOpenSSL",
- ]
- )
- )
Expand Down Expand Up @@ -138,7 +139,7 @@ index 0ae87994f8..2bb59bb944 100644

# These are the main dependencies for users of ray. This list
# should be carefully curated. If you change it, please reflect
@@ -341,19 +251,7 @@ if setup_spec.type == SetupType.RAY:
@@ -342,18 +251,7 @@ if setup_spec.type == SetupType.RAY:
# install-core-prerelease-dependencies.sh so we can test
# new releases candidates.
if setup_spec.type == SetupType.RAY:
Expand All @@ -154,12 +155,11 @@ index 0ae87994f8..2bb59bb944 100644
- "frozenlist",
- "requests",
- ]
-
+ setup_spec.install_requires = []


def is_native_windows_or_msys():
"""Check to see if we are running on native Windows,
@@ -542,19 +440,19 @@ def build(build_python, build_java, build_cpp):
@@ -543,19 +441,19 @@ def build(build_python, build_java, build_cpp):
env=dict(os.environ, CC="gcc"),
)

Expand Down Expand Up @@ -192,7 +192,7 @@ index 0ae87994f8..2bb59bb944 100644

bazel_flags = ["--verbose_failures"]
if BAZEL_ARGS:
@@ -797,7 +695,7 @@ setuptools.setup(
@@ -798,7 +696,7 @@ setuptools.setup(
# The BinaryDistribution argument triggers build_ext.
distclass=BinaryDistribution,
install_requires=setup_spec.install_requires,
Expand All @@ -202,5 +202,5 @@ index 0ae87994f8..2bb59bb944 100644
entry_points={
"console_scripts": [
--
2.43.0
2.34.1

0 comments on commit 548b853

Please sign in to comment.