Merge: main

.bandit

@@ -0,0 +1,3 @@
+[bandit]
+skips: B506
+exclude: satpy/tests

.codebeatignore

@@ -1,2 +1 @@
 satpy/version.py
-versioneer.py

.git_archival.txt

@@ -1 +1 @@
-ref-names: $Format:%D$
+ref-names: $Format:%D$

.github/CODEOWNERS

@@ -30,7 +30,7 @@ satpy/etc/readers/avhrr_l1b_gaclac.yaml @mraspaud @sfinkens
 satpy/etc/readers/avhrr_l1b_hrpt.yaml @mraspaud
 satpy/etc/readers/clavrx.yaml @djhoese
 satpy/etc/readers/electrol_hrit.yaml @sfinkens @mraspaud
-satpy/etc/readers/fci_l1c_fdhsi.yaml @mraspaud
+satpy/etc/readers/fci_l1c_nc.yaml @ameraner @gerritholl
 satpy/etc/readers/geocat.yaml @djhoese
 satpy/etc/readers/goes-imager_hrit.yaml @sfinkens @mraspaud
 satpy/etc/readers/goes-imager_nc.yaml @sfinkens @mraspaud
@@ -58,7 +58,7 @@ satpy/etc/readers/viirs_l1b.yaml @djhoese
 satpy/etc/readers/virr_l1b.yaml @djhoese @adybbroe
 satpy/etc/writers/cf.yaml @mraspaud
 satpy/etc/writers/ninjotiff.yaml @mraspaud
-satpy/etc/writers/scmi.yaml @djhoese
+satpy/etc/writers/awips_tiled.yaml @djhoese
 satpy/readers/aapp_l1b.py @pnuu @mraspaud @adybbroe
 satpy/readers/abi_l1b.py @djhoese
 satpy/readers/acspo.py @djhoese
@@ -68,7 +68,7 @@ satpy/readers/clavrx.py @djhoese
 satpy/readers/electrol_hrit.py @sfinkens @mraspaud
 satpy/readers/eps_l1b.py @mraspaud @pnuu @adybbroe
 satpy/readers/eum_base.py @sjoro @sfinkens @adybbroe
-satpy/readers/fci_l1c_fdhsi.py @mraspaud
+satpy/readers/fci_l1c_nc.py @ameraner @gerritholl
 satpy/readers/geocat.py @djhoese
 satpy/readers/goes_imager_hrit.py @sfinkens @mraspaud
 satpy/readers/goes_imager_nc.py @sfinkens @mraspaud
@@ -98,6 +98,6 @@ satpy/readers/viirs_l1b.py @djhoese
 satpy/readers/xmlformat.py @mraspaud
 satpy/resample.py @pnuu @djhoese @mraspaud
 satpy/writers/cf_writer.py @mraspaud
-satpy/writers/scmi.py @djhoese
+satpy/writers/awips_tiled.py @djhoese
 utils/coord2area_def.py @mraspaud @adybbroe
 utils/fetch_avhrr_calcoeffs.py @pnuu

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,7 +28,7 @@ If applicable, add screenshots to help explain your problem.
  - OS: [e.g. OSX, Windows, Linux]
  - Satpy Version: [e.g. 0.9.0]
  - PyResample Version:
- - Readers and writers dependencies (when relevant): [run `from satpy.config import check_satpy; check_satpy()`]
+ - Readers and writers dependencies (when relevant): [run `from satpy.utils import check_satpy; check_satpy()`]
 
 **Additional context**
 Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,8 +2,6 @@
 <!-- For works in progress choose "Create draft pull request" from the drop-down green button. -->
 
  - [ ] Closes #xxxx <!-- remove if there is no corresponding issue, which should only be the case for minor changes -->
- - [ ] Tests added and test suite added to parent suite <!-- for all bug fixes or enhancements -->
- - [ ] Tests passed <!-- for all non-documentation changes -->
- - [ ] Passes ``flake8 satpy`` <!-- remove if you did not edit any Python files -->
+ - [ ] Tests added <!-- for all bug fixes or enhancements -->
  - [ ] Fully documented <!-- remove if this change should not be visible to users, e.g., if it is an internal clean-up, or if this is part of a larger project that will be documented later -->
  - [ ] Add your name to `AUTHORS.md` if not there already

.github/workflows/ci.yaml

@@ -0,0 +1,153 @@
+name: CI
+# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency
+# https://docs.github.com/en/developers/webhooks-and-events/events/github-event-types#pullrequestevent
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.type }}
+  cancel-in-progress: true
+
+on: [push, pull_request]
+
+env:
+  CACHE_NUMBER: 0
+
+jobs:
+  lint:
+    name: lint and style checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8 flake8-docstrings flake8-debugger flake8-bugbear pytest
+      - name: Install Satpy
+        run: |
+          pip install -e .
+      - name: Run linting
+        run: |
+          flake8 satpy/
+
+  test:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    needs: [lint]
+    strategy:
+      fail-fast: true
+      matrix:
+        os: ["windows-latest", "ubuntu-latest", "macos-latest"]
+        python-version: ["3.8", "3.9", "3.10"]
+        experimental: [false]
+        include:
+          - python-version: "3.9"
+            os: "ubuntu-latest"
+            experimental: true
+
+    env:
+      PYTHON_VERSION: ${{ matrix.python-version }}
+      OS: ${{ matrix.os }}
+      UNSTABLE: ${{ matrix.experimental }}
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v2
+
+      - name: Setup Conda Environment
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          miniforge-variant: Mambaforge
+          miniforge-version: latest
+          use-mamba: true
+          python-version: ${{ matrix.python-version }}
+          activate-environment: test-environment
+
+      - name: Set cache environment variables
+        shell: bash -l {0}
+        run: |
+          echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
+          CONDA_PREFIX=$(python -c "import sys; print(sys.prefix)")
+          echo "CONDA_PREFIX=$CONDA_PREFIX" >> $GITHUB_ENV
+
+      - uses: actions/cache@v3
+        with:
+          path: ${{ env.CONDA_PREFIX }}
+          key: ${{ matrix.os }}-${{matrix.python-version}}-conda-${{ hashFiles('continuous_integration/environment.yaml') }}-${{ env.DATE }}-${{matrix.experimental}}-${{ env.CACHE_NUMBER }}
+        id: cache
+
+      - name: Update environment
+        run: mamba env update -n test-environment -f continuous_integration/environment.yaml
+        if: steps.cache.outputs.cache-hit != 'true'
+
+      - name: Install unstable dependencies
+        if: matrix.experimental == true
+        shell: bash -l {0}
+        run: |
+          python -m pip install \
+          --index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple/ \
+          --trusted-host pypi.anaconda.org \
+          --no-deps --pre --upgrade \
+          matplotlib \
+          numpy \
+          pandas \
+          scipy; \
+          python -m pip install \
+          --no-deps --upgrade \
+          git+/~https://github.com/dask/dask \
+          git+/~https://github.com/dask/distributed \
+          git+/~https://github.com/zarr-developers/zarr \
+          git+/~https://github.com/Unidata/cftime \
+          git+/~https://github.com/mapbox/rasterio \
+          git+/~https://github.com/pydata/bottleneck \
+          git+/~https://github.com/pydata/xarray \
+          git+/~https://github.com/astropy/astropy;
+
+      - name: Install satpy
+        shell: bash -l {0}
+        run: |
+          python -m pip install --no-deps -e .
+
+      - name: Run unit tests
+        shell: bash -l {0}
+        run: |
+          pytest --cov=satpy satpy/tests --cov-report=xml --cov-report=
+
+      - name: Upload unittest coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          flags: unittests
+          file: ./coverage.xml
+          env_vars: OS,PYTHON_VERSION,UNSTABLE
+
+      - name: Coveralls Parallel
+        uses: AndreMiras/coveralls-python-action@develop
+        with:
+          flag-name: run-${{ matrix.test_number }}
+          parallel: true
+        if: runner.os == 'Linux'
+
+      - name: Run behaviour tests
+        shell: bash -l {0}
+        run: |
+          coverage run --source=satpy -m behave satpy/tests/features --tags=-download
+          coverage xml
+
+      - name: Upload behaviour test coverage to Codecov
+        uses: codecov/codecov-action@v2
+        with:
+          flags: behaviourtests
+          file: ./coverage.xml
+          env_vars: OS,PYTHON_VERSION,UNSTABLE
+
+  coveralls:
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: AndreMiras/coveralls-python-action@develop
+        with:
+          parallel-finished: true

.github/workflows/deploy-sdist.yaml

@@ -0,0 +1,25 @@
+name: Deploy sdist
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v2
+
+      - name: Create sdist
+        shell: bash -l {0}
+        run: python setup.py sdist
+
+      - name: Publish package to PyPI
+        if: github.event.action == 'published'
+        uses: pypa/gh-action-pypi-publish@v1.4.1
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}

.gitignore

@@ -33,6 +33,9 @@ htmlcov
 #Translations
 *.mo
 
+#Sphinx
+doc/source/_build/*
+
 #Mr Developer
 .mr.developer.cfg
 
@@ -70,3 +73,5 @@ htmlcov
 # setuptools_scm files
 # this should be generated automatically when installed
 satpy/version.py
+doc/source/api/*.rst
+doc/source/reader_table.rst

.pre-commit-config.yaml

@@ -1,8 +1,40 @@
 exclude: '^$'
 fail_fast: false
 repos:
--   repo: /~https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+  - repo: /~https://github.com/PyCQA/flake8
+    rev: 5.0.2
     hooks:
-    - id: flake8
-      additional_dependencies: [flake8-docstrings, flake8-debugger, flake8-bugbear]
+      - id: flake8
+        additional_dependencies: [flake8-docstrings, flake8-debugger, flake8-bugbear, mccabe]
+        args: [--max-complexity, "10"]
+  - repo: /~https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+        args: [--unsafe]
+  - repo: /~https://github.com/PyCQA/bandit
+    rev: '1.7.4' # Update me!
+    hooks:
+      - id: bandit
+        args: [--ini, .bandit]
+  - repo: /~https://github.com/pre-commit/mirrors-mypy
+    rev: 'v0.971'  # Use the sha / tag you want to point at
+    hooks:
+      - id: mypy
+        additional_dependencies:
+          - types-docutils
+          - types-pkg-resources
+          - types-PyYAML
+          - types-requests
+        args: ["--python-version", "3.8", "--ignore-missing-imports"]
+  - repo: /~https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        language_version: python3
+ci:
+  # To trigger manually, comment on a pull request with "pre-commit.ci autofix"
+  autofix_prs: false
+  skip: [bandit]

.readthedocs.yml

@@ -0,0 +1,17 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+version: 2
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: doc/source/conf.py
+  fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+build:
+  os: "ubuntu-20.04"
+  tools:
+    python: "mambaforge-4.10"
+conda:
+  environment: doc/rtd_environment.yml