From db16b3c6bd84659423081639719fe1c305791149 Mon Sep 17 00:00:00 2001 From: Justin Trautmann Date: Mon, 27 Nov 2023 15:29:53 +0100 Subject: [PATCH 1/5] support python 3.10 with ray >= 2.0 --- README.md | 10 +--------- requirements.txt | 2 +- setup.py | 1 + 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 7ea734f..bd18270 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,7 @@ Install `prefect-ray` with `pip`: pip install prefect-ray ``` -Users running Apple Silicon (such as M1 macs) will need to additionally run: -``` -pip uninstall grpcio -conda install grpcio -``` +Users running Apple Silicon (such as M1 macs) will need to install ray in a miniforge conda environment. Click [here](https://docs.ray.io/en/master/ray-overview/installation.html#m1-mac-apple-silicon-support) for more details. ## Running tasks on Ray @@ -130,10 +126,6 @@ def my_flow(): Note that Ray Client uses the [ray://](https://docs.ray.io/en/master/cluster/ray-client.html) URI to indicate the address of a Ray instance. If you don't provide the `address` of a Ray instance, Prefect creates a temporary instance automatically. !!! warning "Ray environment limitations" - While we're excited about adding support for parallel task execution via Ray to Prefect, there are some inherent limitations with Ray you should be aware of: - - Ray currently does not support Python 3.10. - Ray support for non-x86/64 architectures such as ARM/M1 processors with installation from `pip` alone and will be skipped during installation of Prefect. It is possible to manually install the blocking component with `conda`. See the [Ray documentation](https://docs.ray.io/en/latest/ray-overview/installation.html#m1-mac-apple-silicon-support) for instructions. See the [Ray installation documentation](https://docs.ray.io/en/latest/ray-overview/installation.html) for further compatibility information. diff --git a/requirements.txt b/requirements.txt index b21eaed..13bcd14 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ prefect>=2.13.5 -ray[default] >= 1.12.0; python_version >= '3.7' and python_version < '3.10' +ray[default] >= 2.0.0 pickle5 >= 0.0.11; python_version < '3.8' diff --git a/setup.py b/setup.py index 52da512..c9e13c7 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Topic :: Software Development :: Libraries", ], ) From 76629b0d05510974ac44cf8878e2122f691a676e Mon Sep 17 00:00:00 2001 From: Justin Trautmann Date: Mon, 27 Nov 2023 15:55:38 +0100 Subject: [PATCH 2/5] CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b3d782..8e382a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Security +## 0.2.6 + +Released on November 27th, 2023. + +### Added + +- Support Python 3.10 + ## 0.2.5 Released on April 27th, 2023. From 3f280c3aa07852641ae345b1c46d83676b75a9bf Mon Sep 17 00:00:00 2001 From: Justin Trautmann Date: Tue, 28 Nov 2023 11:57:02 +0100 Subject: [PATCH 3/5] require python >=3.8 --- .github/workflows/tests.yml | 4 +--- CHANGELOG.md | 2 +- requirements-dev.txt | 1 - requirements.txt | 1 - setup.py | 3 +-- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b2a9cc6..f76a63f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,9 +11,7 @@ jobs: python-version: - "3.8" - "3.9" - # temporarily remove because Ray doesn't support yet - # https://github.com/ray-project/ray/issues/19116 - # - "3.10" + - "3.10" fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e382a6..5b7e871 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ Released on November 27th, 2023. ### Added -- Support Python 3.10 +- Support for Python 3.10 ## 0.2.5 diff --git a/requirements-dev.txt b/requirements-dev.txt index 7aad06e..092dfe9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,7 +9,6 @@ mkdocstrings[python] isort pre-commit pytest-asyncio -mock; python_version < '3.8' mkdocs-gen-files interrogate coverage diff --git a/requirements.txt b/requirements.txt index 13bcd14..a02eb3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ prefect>=2.13.5 ray[default] >= 2.0.0 -pickle5 >= 0.0.11; python_version < '3.8' diff --git a/setup.py b/setup.py index c9e13c7..d83baf5 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ version=versioneer.get_version(), cmdclass=versioneer.get_cmdclass(), packages=find_packages(exclude=("tests", "docs")), - python_requires=">=3.7", + python_requires=">=3.8", install_requires=install_requires, extras_require={"dev": dev_requires}, classifiers=[ @@ -33,7 +33,6 @@ "Intended Audience :: System Administrators", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", From 7b684e41252e75050a0ec510c302c46f5b8dbc84 Mon Sep 17 00:00:00 2001 From: Alexander Streed Date: Wed, 29 Nov 2023 08:49:57 -0600 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b7e871..276be69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## 0.2.6 -Released on November 27th, 2023. +Released on November 29th, 2023. ### Added From f7d2762db309d141f3168cace93742b11e220f1f Mon Sep 17 00:00:00 2001 From: Alexander Streed Date: Wed, 29 Nov 2023 08:50:26 -0600 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 276be69..00807c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ Released on November 29th, 2023. ### Added -- Support for Python 3.10 +- Support for Python 3.10 - [#105](https://github.com/PrefectHQ/prefect-ray/pull/105) ## 0.2.5