Skip to content

Commit 5c74157

Browse files
authored
Merge pull request #125 from raybellwaves/patch-2
move rangehttpserver to conda install
2 parents d31d1fa + 05b91f0 commit 5c74157

File tree

5 files changed

+21
-17
lines changed

5 files changed

+21
-17
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
CONDA_ENV: [py37, py38, py39, upstream]
16+
CONDA_ENV: [py310, py38, py39, upstream]
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v2

ci/environment-py37.yml renamed to ci/environment-py310.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: test_env
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.7
5+
- python=3.10
66
- aiohttp
77
- boto3
88
- exifread
@@ -17,7 +17,7 @@ dependencies:
1717
- s3fs >= 2021.08.0
1818
- scikit-image
1919
- xarray >= 0.17
20+
- rangehttpserver
2021
- zarr
21-
- pip:
22-
- rangehttpserver
23-
- moto[s3]==1
22+
- moto < 3
23+
- s3fs

ci/environment-py38.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dependencies:
1616
- rasterio
1717
- s3fs >= 2021.08.0
1818
- scikit-image
19+
- rangehttpserver
1920
- xarray >= 0.17
2021
- zarr
21-
- pip:
22-
- rangehttpserver
23-
- moto[s3]==1
22+
- moto < 3
23+
- s3fs

ci/environment-py39.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dependencies:
1616
- rasterio
1717
- s3fs >= 2021.08.0
1818
- scikit-image
19+
- rangehttpserver
1920
- xarray >= 0.17
2021
- zarr
21-
- pip:
22-
- rangehttpserver
23-
- moto[s3]==1
22+
- moto < 3
23+
- s3fs

ci/environment-upstream.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,28 @@ name: test_env
22
channels:
33
- conda-forge
44
dependencies:
5-
- python==3.9
5+
- python==3.10
66
- aiohttp
7-
- boto3
87
- exifread
98
- flask
109
- h5netcdf
1110
- netcdf4
1211
- pip
1312
- pydap
1413
- pytest
14+
- rangehttpserver
1515
- rasterio
16-
- tornado
16+
- s3fs
1717
- scikit-image
18+
- entrypoints
19+
- pandas
20+
- tornado
1821
- zarr
19-
- s3fs
20-
- moto
22+
- moto < 3
23+
- intake
24+
- rioxarray
25+
- gdal
2126
- pip:
2227
- git+https://github.com/fsspec/filesystem_spec.git
2328
- git+https://github.com/intake/intake.git
2429
- git+https://github.com/pydata/xarray.git
25-
- rangehttpserver

0 commit comments

Comments
 (0)