Skip to content

adopt conda-forge #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adopt conda-forge #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ install:

# Customise the testing environment
# ---------------------------------
- conda config --add channels scitools
- conda config --add channels conda-forge
- if [[ "$TEST_MINIMAL" == true ]]; then
conda install --quiet --file minimal-conda-requirements.txt;
else
if [[ "$TRAVIS_PYTHON_VERSION" == 3* ]]; then
sed -e '/ecmwf_grib/d' -e '/esmpy/d' -e '/iris_grib/d' -e 's/#.\+$//' conda-requirements.txt | xargs conda install --quiet;
sed -e '/ecmwf_grib/d' -e '/esmpy/d' -e '/iris-grib/d' -e 's/#.\+$//' conda-requirements.txt | xargs conda install --quiet;
else
conda install --quiet --file conda-requirements.txt;
fi
Expand Down
10 changes: 5 additions & 5 deletions conda-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Mandatory dependencies
biggus
cartopy
matplotlib
netcdf4
numpy
matplotlib<2
netcdf4==1.2.2
numpy<1.12
pyke
udunits2
cf_units
Expand All @@ -19,14 +19,14 @@ mock
nose
pep8
sphinx
iris_sample_data
iris-sample-data
filelock
imagehash
requests

# Optional iris dependencies
nc_time_axis
iris_grib
iris-grib
esmpy>=7.0
gdal
libmo_unpack
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/weighted_mean_lat.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<coord name="lat"/>
</cellMethod>
</cellMethods>
<data dtype="float64" shape="(3,)" state="loaded"/>
<data dtype="float32" shape="(3,)" state="loaded"/>
</cube>
</cubes>
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/weighted_mean_latlon.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
<coord name="lon"/>
</cellMethod>
</cellMethods>
<data dtype="float64" shape="()" state="loaded"/>
<data dtype="float32" shape="()" state="loaded"/>
</cube>
</cubes>
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/weighted_mean_lon.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<coord name="lon"/>
</cellMethod>
</cellMethods>
<data dtype="float64" shape="(3,)" state="loaded"/>
<data dtype="float32" shape="(3,)" state="loaded"/>
</cube>
</cubes>
5 changes: 3 additions & 2 deletions lib/iris/tests/results/imagerepo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,11 +728,12 @@
"iris.tests.test_quickplot.TestTimeReferenceUnitsLabels.test_not_reference_time_units.0": [
"https://scitools.github.io/test-iris-imagehash/images/415f85e9fefb91e94600bb6f07009be7effa1966ab065b273b009b663b007a04.png",
"https://scitools.github.io/test-iris-imagehash/images/411d85e9fefb91e14600bb6707009be7effe1966ab06fb273b009b663f007a04.png",
"https://scitools.github.io/test-iris-imagehash/images/411f85e9fefb91e14600bb6f07009be7effe1966ab067b273b009b663b007a04.png"
"https://scitools.github.io/test-iris-imagehash/images/411f85e9fefb91e14600bb6f07009be7effe1966ab067b273b009b663b007a04.png",
"https://scitools.github.io/test-iris-imagehash/images/411f85e9fefb91e14600bb6707009be7effe1966ab06fb273b00bb263b007a04.png"
],
"iris.tests.test_quickplot.TestTimeReferenceUnitsLabels.test_reference_time_units.0": [
"https://scitools.github.io/test-iris-imagehash/images/417f8119feebeeff070054bb2b0014a0bb157ba6bb972b46dabf3b0419827b04.png",
"https://scitools.github.io/test-iris-imagehash/images/417f8119fefbeeff070054b92b0014a0bb557ba69b95ab46dabf3b0419827b04.png",
"https://scitools.github.io/test-iris-imagehash/images/417f8119fefbeeff070054bb2b0014a0bb14fbe69b952b46dabf3b0419827b04.png"
]
}
}
6 changes: 3 additions & 3 deletions minimal-conda-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Mandatory dependencies
biggus
cartopy
matplotlib
netcdf4
numpy
matplotlib<2
netcdf4==1.2.2
numpy<1.12
pyke
udunits2
cf_units
Expand Down