Skip to content

Commit e454833

Browse files
committed
Remove strict channel priority to try to unblock env solves?
1 parent 29e56e0 commit e454833

File tree

8 files changed

+3
-13
lines changed

8 files changed

+3
-13
lines changed

.github/workflows/test-upstream.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
miniforge-variant: Mambaforge
6363
use-mamba: true
6464
python-version: ${{ matrix.python }}
65-
channel-priority: strict
6665
activate-environment: dask-sql
6766
environment-file: ${{ env.CONDA_FILE }}
6867
- name: Optionally update upstream cargo dependencies
@@ -82,7 +81,7 @@ jobs:
8281
- name: Install upstream dev Dask
8382
if: env.which_upstream == 'Dask'
8483
run: |
85-
mamba install --no-channel-priority dask/label/dev::dask
84+
mamba install dask/label/dev::dask
8685
- name: Install pytest-reportlog
8786
run: |
8887
# TODO: add pytest-reportlog to testing environments if we move over to JSONL output
@@ -111,7 +110,6 @@ jobs:
111110
miniforge-variant: Mambaforge
112111
use-mamba: true
113112
python-version: "3.9"
114-
channel-priority: strict
115113
- name: Install Protoc
116114
uses: arduino/setup-protoc@v1
117115
with:

.github/workflows/test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
miniforge-variant: Mambaforge
6262
use-mamba: true
6363
python-version: ${{ matrix.python }}
64-
channel-priority: strict
6564
activate-environment: dask-sql
6665
environment-file: ${{ env.CONDA_FILE }}
6766
run-post: ${{ matrix.os != 'windows-latest' && 'true' || 'false' }}
@@ -82,7 +81,7 @@ jobs:
8281
- name: Optionally install upstream dev Dask
8382
if: needs.detect-ci-trigger.outputs.triggered == 'true'
8483
run: |
85-
mamba install --no-channel-priority dask/label/dev::dask
84+
mamba install dask/label/dev::dask
8685
- name: Test with pytest
8786
run: |
8887
pytest --junitxml=junit/test-results.xml --cov-report=xml -n auto tests --dist loadfile
@@ -108,7 +107,6 @@ jobs:
108107
miniforge-variant: Mambaforge
109108
use-mamba: true
110109
python-version: "3.9"
111-
channel-priority: strict
112110
- name: Install Protoc
113111
uses: arduino/setup-protoc@v1
114112
with:

continuous_integration/environment-3.10.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: dask-sql
22
channels:
33
- conda-forge
4-
- nodefaults
54
dependencies:
65
- c-compiler
76
- dask>=2022.3.0

continuous_integration/environment-3.11.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
name: dask-sql
1+
name: dask-sql-py311
22
channels:
33
- conda-forge
4-
- nodefaults
54
dependencies:
65
- c-compiler
76
- dask>=2022.3.0

continuous_integration/environment-3.9.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: dask-sql
22
channels:
33
- conda-forge
4-
- nodefaults
54
dependencies:
65
- c-compiler
76
- dask=2022.3.0

continuous_integration/gpuci/environment-3.10.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ channels:
44
- rapidsai-nightly
55
- nvidia
66
- conda-forge
7-
- nodefaults
87
dependencies:
98
- c-compiler
109
- dask>=2022.3.0

continuous_integration/gpuci/environment-3.9.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ channels:
44
- rapidsai-nightly
55
- nvidia
66
- conda-forge
7-
- nodefaults
87
dependencies:
98
- c-compiler
109
- dask=2022.3.0

docs/environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: dask-sql-docs
22
channels:
33
- conda-forge
4-
- nodefaults
54
dependencies:
65
- python=3.9
76
- sphinx>=4.0.0

0 commit comments

Comments
 (0)