Skip to content

Commit

Permalink
Stop using defaults channel in dev environments (dask-contrib#393)
Browse files Browse the repository at this point in the history
* Use strict channel_priority for CI environments

* Use nodefaults channel in conda environments

* Change python versions in GHA workflows to strings
  • Loading branch information
charlesbluca authored Feb 7, 2022
1 parent 07f1649 commit 8d64800
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: 3.8
python-version: "3.8"
channel-priority: strict
- name: Install dependencies
run: |
mamba install boa conda-verify
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: 3.8
python-version: "3.8"
channel-priority: strict
activate-environment: dask-sql
environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
- name: Install dependencies
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: 3.8
python-version: "3.8"
channel-priority: strict
activate-environment: dask-sql
environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
- name: Install dependencies and build the jar
Expand All @@ -52,7 +53,7 @@ jobs:
matrix:
java: [8, 11]
os: [ubuntu-latest, windows-latest]
python: [3.7, 3.8, 3.9]
python: ["3.7", "3.8", "3.9"]
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -68,6 +69,7 @@ jobs:
miniforge-variant: Mambaforge
use-mamba: true
python-version: ${{ matrix.python }}
channel-priority: strict
activate-environment: dask-sql
environment-file: ${{ env.CONDA_FILE }}
- name: Download the pre-build jar
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: 3.8
python-version: "3.8"
channel-priority: strict
activate-environment: dask-sql
environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
- name: Build the jar
Expand All @@ -76,7 +77,7 @@ jobs:
matrix:
java: [8, 11]
os: [ubuntu-latest, windows-latest]
python: [3.7, 3.8, 3.9]
python: ["3.7", "3.8", "3.9"]
steps:
- uses: actions/checkout@v2
- name: Cache local Maven repository
Expand All @@ -90,6 +91,7 @@ jobs:
miniforge-variant: Mambaforge
use-mamba: true
python-version: ${{ matrix.python }}
channel-priority: strict
activate-environment: dask-sql
environment-file: ${{ env.CONDA_FILE }}
- name: Download the pre-build jar
Expand Down Expand Up @@ -145,7 +147,8 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: 3.8
python-version: "3.8"
channel-priority: strict
activate-environment: dask-sql
environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
- name: Download the pre-build jar
Expand Down Expand Up @@ -195,10 +198,10 @@ jobs:
- name: Set up Python
uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.8
python-version: "3.8"
mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
channel-priority: strict
- name: Download the pre-build jar
uses: actions/download-artifact@v1
with:
Expand Down
1 change: 1 addition & 0 deletions continuous_integration/environment-3.7-jdk11-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: dask-sql
channels:
- conda-forge
- nodefaults
dependencies:
- adagio>=0.2.3
- antlr4-python3-runtime>=4.9.2
Expand Down
1 change: 1 addition & 0 deletions continuous_integration/environment-3.7-jdk8-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: dask-sql
channels:
- conda-forge
- nodefaults
dependencies:
- adagio>=0.2.3
- antlr4-python3-runtime>=4.9.2
Expand Down
1 change: 1 addition & 0 deletions continuous_integration/environment-3.8-jdk11-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: dask-sql
channels:
- conda-forge
- nodefaults
dependencies:
- adagio>=0.2.3
- antlr4-python3-runtime>=4.9.2
Expand Down
1 change: 1 addition & 0 deletions continuous_integration/environment-3.8-jdk8-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: dask-sql
channels:
- conda-forge
- nodefaults
dependencies:
- adagio>=0.2.3
- antlr4-python3-runtime>=4.9.2
Expand Down
1 change: 1 addition & 0 deletions continuous_integration/environment-3.9-jdk11-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: dask-sql
channels:
- conda-forge
- nodefaults
dependencies:
- adagio>=0.2.3
- antlr4-python3-runtime>=4.9.2
Expand Down
1 change: 1 addition & 0 deletions continuous_integration/environment-3.9-jdk8-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: dask-sql
channels:
- conda-forge
- nodefaults
dependencies:
- adagio>=0.2.3
- antlr4-python3-runtime>=4.9.2
Expand Down

0 comments on commit 8d64800

Please sign in to comment.