Skip to content

Commit 7eeb9b7

Browse files
authored
FIX-modin-project#6587: Use different env files for unidist engine for windows and linux (modin-project#6588)
Signed-off-by: Igoshev, Iaroslav <iaroslav.igoshev@intel.com>
1 parent 23ebe6b commit 7eeb9b7

File tree

3 files changed

+64
-2
lines changed

3 files changed

+64
-2
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ jobs:
349349
- uses: actions/checkout@v3
350350
- uses: ./.github/actions/mamba-env
351351
with:
352-
environment-file: requirements/env_unidist.yml
352+
environment-file: requirements/env_unidist_linux.yml
353353
activate-environment: modin_on_unidist
354354
python-version: ${{matrix.python-version}}
355355
- name: Install HDF5
@@ -556,7 +556,7 @@ jobs:
556556
- uses: actions/checkout@v3
557557
- uses: ./.github/actions/mamba-env
558558
with:
559-
environment-file: ${{ matrix.execution.name == 'unidist' && 'requirements/env_unidist.yml' || 'environment-dev.yml' }}
559+
environment-file: ${{ matrix.os == 'ubuntu' && matrix.execution.name == 'unidist' && 'requirements/env_unidist_linux.yml' || matrix.os == 'windows' && matrix.execution.name == 'unidist' && 'requirements/env_unidist_win.yml' || 'environment-dev.yml' }}
560560
activate-environment: ${{ matrix.execution.name == 'unidist' && 'modin_on_unidist' || 'modin' }}
561561
python-version: ${{matrix.python-version}}
562562
- name: Install HDF5

requirements/env_unidist.yml requirements/env_unidist_linux.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ dependencies:
88
- pandas>=2.1,<2.2
99
- numpy>=1.22.4
1010
- unidist-mpi>=0.2.1
11+
- mpich
1112
- fsspec>=2022.05.0
1213
- packaging>=21.0
1314
- psutil>=5.8.0

requirements/env_unidist_win.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: modin_on_unidist
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- pip
6+
7+
# required dependencies
8+
- pandas>=2.1,<2.2
9+
- numpy>=1.22.4
10+
- unidist-mpi>=0.2.1
11+
- msmpi
12+
- fsspec>=2022.05.0
13+
- packaging>=21.0
14+
- psutil>=5.8.0
15+
16+
# optional dependencies
17+
- pyarrow>=7.0.0
18+
- xarray>=2022.03.0
19+
- jinja2>=3.1.2
20+
- scipy>=1.8.1
21+
- s3fs>=2022.05.0
22+
- lxml>=4.8.0
23+
- openpyxl>=3.0.10
24+
- xlrd>=2.0.1
25+
- matplotlib>=3.6.1
26+
- sqlalchemy>=1.4.0,<1.4.46
27+
- pandas-gbq>=0.15.0
28+
- pytables>=3.7.0
29+
# pymssql==2.2.8 broken: https://github.com/modin-project/modin/issues/6429
30+
- pymssql>=2.1.5,!=2.2.8
31+
- psycopg2>=2.9.3
32+
- fastparquet>=0.8.1
33+
- tqdm>=4.60.0
34+
# pandas isn't compatible with numexpr=2.8.5: https://github.com/modin-project/modin/issues/6469
35+
- numexpr<2.8.5
36+
37+
# dependencies for making release
38+
- pygithub>=v1.58.0
39+
- pygit2>=1.9.2
40+
41+
# test dependencies
42+
- coverage>=7.1.0
43+
- moto>=4.1.0
44+
- pytest>=7.3.2
45+
- pytest-cov>=4.0.0
46+
- pytest-xdist>=3.2.0
47+
48+
# code linters
49+
- black>=23.1.0
50+
- flake8>=6.0.0
51+
- flake8-no-implicit-concat>=0.3.4
52+
- flake8-print>=5.0.0
53+
- mypy>=1.0.0
54+
- pandas-stubs>=2.0.0
55+
56+
- pip:
57+
# Fixes breaking ipywidgets changes, but didn't release yet.
58+
- git+https://github.com/modin-project/modin-spreadsheet.git@49ffd89f683f54c311867d602c55443fb11bf2a5
59+
- connectorx>=0.2.6a4
60+
# The `numpydoc` version should match the version installed in the `lint-pydocstyle` job of the CI.
61+
- numpydoc==1.1.0

0 commit comments

Comments
 (0)