Skip to content
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.

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

Fix MERSI-2 natural_color composite using the wrong band for sharpening #939

Merged
merged 4 commits into from
Oct 17, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ env:
- CONDA_CHANNEL_PRIORITY='strict'
matrix:
include:
- env: PYTHON_VERSION=2.7
- env:
- PYTHON_VERSION=2.7
- NUMPY_VERSION=1.16
os: linux
- env: PYTHON_VERSION=2.7
- env:
- PYTHON_VERSION=2.7
- NUMPY_VERSION=1.16
os: osx
language: generic
- env: PYTHON_VERSION=3.6
Expand All @@ -25,8 +29,7 @@ matrix:
os: osx
language: generic
install:
# - git clone --depth 1 git://github.com/astropy/ci-helpers.git
- git clone --depth 1 -b all-the-fixes git://github.com/djhoese/ci-helpers.git
- git clone --depth 1 git://github.com/astropy/ci-helpers.git
- source ci-helpers/travis/setup_conda.sh
script:
- coverage run --source=satpy setup.py test
Expand Down
5 changes: 2 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ environment:

matrix:
- PYTHON: "C:\\Python36_64"
PYTHON_VERSION: "3.6"
PYTHON_VERSION: "3.7"
PYTHON_ARCH: "64"
NUMPY_VERSION: "stable"

install:
# - "git clone --depth 1 git://github.com/astropy/ci-helpers.git"
- "git clone --depth 1 -b all-the-fixes git://github.com/djhoese/ci-helpers.git"
- "git clone --depth 1 git://github.com/astropy/ci-helpers.git"
- "powershell ci-helpers/appveyor/install-miniconda.ps1"
- "conda activate test"

Expand Down
4 changes: 2 additions & 2 deletions satpy/etc/composites/mersi-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ composites:
prerequisites:
- name: '6'
modifiers: [sunz_corrected]
- name: '4'
- name: '15'
modifiers: [sunz_corrected]
- name: '3'
modifiers: [sunz_corrected]
optional_prerequisites:
- name: '15'
- name: '4'
modifiers: [sunz_corrected]
standard_name: natural_color
high_resolution_band: green