Skip to content

Commit e2bc5b9

Browse files
Unpinning ray from requirements-dev.txt (unionai-oss#1052)
* unpinning ray from requirements-dev.txt Signed-off-by: erichamers <[email protected]> * altered environment.yml and ran scripts/generate_pip_deps_from_conda.py Signed-off-by: erichamers <[email protected]> * removed ray version pinning from setup.py Signed-off-by: erichamers <[email protected]> * installing ray with conda on ci tests Signed-off-by: erichamers <[email protected]> * Update ci-tests.yml Signed-off-by: Niels Bantilan <[email protected]> * special-case: dont install ray on windows, python 3.10 Signed-off-by: Niels Bantilan <[email protected]> * add back geopandas Signed-off-by: Niels Bantilan <[email protected]> * disable modin-ray tests for problem os and python version Signed-off-by: Niels Bantilan <[email protected]> * Update ci-tests.yml * disable modin-ray CI for python3.7 * update ci Signed-off-by: Niels Bantilan <[email protected]> * fix yaml Signed-off-by: Niels Bantilan <[email protected]> Signed-off-by: erichamers <[email protected]> Signed-off-by: Niels Bantilan <[email protected]> Co-authored-by: Niels Bantilan <[email protected]>
1 parent 0301dec commit e2bc5b9

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

.github/workflows/ci-tests.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,8 @@ jobs:
101101
matrix:
102102
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
103103
python-version: ["3.7", "3.8", "3.9", "3.10"]
104-
pandas-version: ["1.2.0", "1.3.0", "latest"]
104+
pandas-version: ["1.3.0", "latest"]
105105
exclude:
106-
- python-version: "3.10"
107-
pandas-version: "1.2.0"
108106
- python-version: "3.10"
109107
pandas-version: "1.3.0"
110108
include:
@@ -155,6 +153,11 @@ jobs:
155153
if: ${{ matrix.pandas-version != 'latest' }}
156154
run: mamba install -c conda-forge pandas==${{ matrix.pandas-version }} geopandas
157155

156+
# ray currently cannot be installed on python 3.10, windows
157+
- name: Remove Ray from Deps
158+
if: ${{ matrix.os == 'windows-latest' && matrix.python-version == '3.10' }}
159+
run: sed -i 's/^ray//g' requirements-dev.txt
160+
158161
- name: Install Pip Deps
159162
run: |
160163
python -m pip install -U pip
@@ -203,7 +206,11 @@ jobs:
203206
CI_MODIN_ENGINES: dask
204207

205208
- name: Unit Tests - Modin-Ray
206-
if: ${{ matrix.python-version != '3.10' }}
209+
# ray CI issues with the following:
210+
# - windows, python 3.10
211+
# - mac, python 3.7
212+
# Tracking issue: https://github.com/modin-project/modin/issues/5466
213+
if: ${{ matrix.os != 'windows-latest' && !contains(fromJson('["3.7", "3.10"]'), matrix.python-version) }}
207214
run: pytest tests/modin ${{ env.PYTEST_FLAGS }}
208215
env:
209216
CI_MODIN_ENGINES: ray
@@ -212,9 +219,9 @@ jobs:
212219
uses: codecov/codecov-action@v3
213220

214221
- name: Check Docstrings
215-
if: ${{ matrix.os != 'windows-latest' && matrix.python-version != '3.10' && matrix.python-version != '3.7' }}
222+
if: ${{ matrix.os != 'windows-latest' && !contains(fromJson('["3.7", "3.10"]'), matrix.python-version) }}
216223
run: nox ${{ env.NOX_FLAGS }} --session doctests
217224

218225
- name: Check Docs
219-
if: ${{ matrix.os != 'windows-latest' && matrix.python-version != '3.10' && matrix.python-version != '3.7' }}
226+
if: ${{ matrix.os != 'windows-latest' && !contains(fromJson('["3.7", "3.10"]'), matrix.python-version) }}
220227
run: nox ${{ env.NOX_FLAGS }} --session docs

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ dependencies:
8080

8181
- pip:
8282
- furo
83-
- ray <= 1.7.0; python_version < '3.10'
83+
- ray
8484
- types-click
8585
- types-pyyaml
8686
- types-pkg_resources

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ twine
4747
asv
4848
pre_commit
4949
furo
50-
ray <= 1.7.0; python_version < '3.10'
50+
ray
5151
types-click
5252
types-pyyaml
5353
types-pkg_resources

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from setuptools import setup, find_packages
1+
from setuptools import find_packages, setup
22

33
with open("README.md") as f:
44
long_description = f.read()
@@ -12,8 +12,8 @@
1212
"hypotheses": ["scipy"],
1313
"io": ["pyyaml >= 5.1", "black", "frictionless"],
1414
"pyspark": ["pyspark >= 3.2.0"],
15-
"modin": ["modin", "ray <= 1.7.0", "dask"],
16-
"modin-ray": ["modin", "ray <= 1.7.0"],
15+
"modin": ["modin", "ray", "dask"],
16+
"modin-ray": ["modin", "ray"],
1717
"modin-dask": ["modin", "dask"],
1818
"dask": ["dask"],
1919
"mypy": ["pandas-stubs"],

0 commit comments

Comments
 (0)