Skip to content

Commit 83136d4

Browse files
committed
Fixing conf/conda build and azure-pipelines. Dropping py27 test on azure.
1 parent 9e415d7 commit 83136d4

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

azure-pipelines.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ jobs:
55
vmImage: 'macOS-10.14'
66
strategy:
77
matrix:
8-
Python27:
9-
python.version: '2.7'
108
Python36:
119
python.version: '3.6'
1210
Python37:
1311
python.version: '3.7'
1412
Python38:
1513
python.version: '3.8'
14+
Python39:
15+
python.version: '3.9'
1616

1717
steps:
1818
- bash: echo "##vso[task.prependpath]$CONDA/bin"
@@ -23,9 +23,8 @@ jobs:
2323

2424
- bash: |
2525
conda config --add channels conda-forge
26-
conda config --add channels spectralDNS
2726
conda config --set always_yes yes
28-
conda install -n root conda-build=3.17
27+
conda install -n root conda-build
2928
displayName: Set up Anaconda
3029
3130
- bash: |
@@ -38,22 +37,23 @@ jobs:
3837
vmImage: 'ubuntu-16.04'
3938
strategy:
4039
matrix:
41-
Python27:
42-
python.version: '2.7'
4340
Python36:
4441
python.version: '3.6'
4542
Python37:
4643
python.version: '3.7'
44+
Python38:
45+
python.version: '3.8'
46+
Python39:
47+
python.version: '3.9'
4748

4849
steps:
4950
- bash: echo "##vso[task.prependpath]$CONDA/bin"
5051
displayName: Add conda to PATH
5152

5253
- bash: |
5354
conda config --add channels conda-forge
54-
conda config --add channels spectralDNS
5555
conda config --set always_yes yes
56-
conda install -n root conda-build=3.17
56+
conda install -n root conda-build
5757
displayName: Set up Anaconda
5858
5959
- bash: |

bitbucket-pipelines.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ pipelines:
66
script:
77
- conda config --set always_yes yes
88
- conda config --add channels conda-forge
9-
- conda config --add channels spectralDNS
10-
- conda install -n root conda-build=3.17
9+
- conda install -n root conda-build
1110
- conda build conf/

conf/meta.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ requirements:
2626
- mpich
2727
- {{ pin_compatible('numpy') }}
2828
- fftw
29-
- hdf5 * mpi_*
30-
- h5py * mpi_*
31-
- netcdf4-parallel
29+
- hdf5 * mpi_* # [py>36]
30+
- h5py * mpi_* # [py>36]
31+
- netcdf4 * mpi_*
3232

3333
test:
3434
requires:

0 commit comments

Comments
 (0)