Merge pull request #28 from wpreimes/new-ci-and-reshuffle-bbox

New ci and reshuffle bbox

.github/workflows/ci.yml

@@ -0,0 +1,119 @@
+# This workflow will install Python dependencies and run tests on
+# windows and linux systems with a variety of Python versions
+
+# For more information see:
+# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Automated Tests
+
+on:
+  push:
+  pull_request:
+  schedule: # only upstream, won't trigger on forks!
+    - cron: '0 0 * * *' # daily
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "windows-latest"]
+        python-version: ['3.6', '3.7', '3.8', '3.9']
+        ymlfile: ['latest.yml']
+    name: Py${{ matrix.python-version }}@${{ matrix.os }}|${{ matrix.ymlfile }}
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true # does not work with self-hosted testdata
+          fetch-depth: 0
+      - uses: conda-incubator/setup-miniconda@v2.0.1
+        with:
+          miniconda-version: "latest"
+          auto-update-conda: true
+          python-version: ${{ matrix.python-version }}
+          environment-file: environment/${{ matrix.ymlfile }}
+          activate-environment: ecmwf_models # todo: must match with name in latest.yml
+          auto-activate-base: false
+      - name: Print Infos
+        shell: bash -l {0}
+        run: |
+          conda info -a
+          conda list
+          pip list
+          which pip
+          which python
+      - name: Export Environment
+        shell: bash -l {0}
+        run: |
+          mkdir -p .artifacts
+          if [ ${{ matrix.ymlfile }} == "latest.yml" ]
+          then
+              filename=pinned_${{ matrix.python-version }}_${{ matrix.os }}.yml
+              conda env export --no-builds | grep -v "prefix" > .artifacts/$filename
+          fi
+      - name: Install package and test
+        shell: bash -l {0}
+        run: |
+          pip install .
+          pytest
+      - name: Upload Coverage
+        shell: bash -l {0}
+        run: |
+          pip install coveralls && coveralls --service=github
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_FLAG_NAME: ${{ matrix.python-version }}
+          COVERALLS_PARALLEL: true
+      - name: Create wheel and dist package
+        shell: bash -l {0}
+        run: |
+          pip install setuptools_scm
+          if [ ${{ matrix.os }} == "windows-latest" ]
+          then
+            # build whls on windows
+            pip install wheel
+            python setup.py bdist_wheel --dist-dir .artifacts/dist
+          else
+            # build dist on linux
+            python setup.py sdist --dist-dir .artifacts/dist
+          fi
+          ls .artifacts/dist
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Artifacts
+          path: .artifacts/*
+  coveralls:
+    name: Submit Coveralls 👚
+    needs: build
+    runs-on: ubuntu-latest
+    container: python:3-slim
+    steps:
+      - name: Finished
+        run: |
+          pip3 install --upgrade coveralls && coveralls --service=github --finish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  publish:
+    name: Upload to PyPI
+    if: startsWith(github.ref, 'refs/tags/v') && startsWith(github.repository, 'TUW-GEO')
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Print environment variables
+        run: |
+          echo "GITHUB_REF = $GITHUB_REF"
+          echo "GITHUB_REPOSITORY = $GITHUB_REPOSITORY"
+      - name: Download Artifacts
+        uses: actions/download-artifact@v2
+      - name: Display downloaded files
+        run: ls -aR
+      - name: Upload to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.4.1
+        with:
+          skip_existing: true
+          verbose: true
+          verify_metadata: true
+          packages_dir: Artifacts/dist/
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}  # todo: add pypi token to GHA

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  -   repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v3.2.0
+      hooks:
+        -   id: trailing-whitespace
+        -   id: end-of-file-fixer
+        -   id: check-yaml
+  -   repo: https://gitlab.com/pycqa/flake8
+      rev: 3.7.9
+      hooks:
+        -   id: flake8
+            entry: bash -c 'git diff --staged -- "$@" | flake8 --diff' --

.readthedocs.yml

@@ -6,7 +6,14 @@ sphinx:
 formats:
   - pdf
 
+submodules:
+  include: all
+
+conda:
+  environment: environment.yml
+
 python:
   version: 3.7
   install:
-    - requirements: docs/requirements.txt
+    - method: pip
+      path: .

CHANGELOG.rst

@@ -6,12 +6,21 @@ Unreleased
 ==========
 -
 
+Version 0.8
+===========
+
+- Program `era5_download` returns exit code now (PR `#27 <https://github.com/TUW-GEO/ecmwf_models/pull/27>`_);
+- Program `era5_reshuffle` can now take a bounding box to reshuffle spatial subsets;
+- TravisCI was replaced by Github Actions;
+- Pyscaffold 4 is used; contributing guide added; pre-commit added;
+- Code formatting with black (line length 79);
+
 Version 0.7
 ===========
 
 - Update pyscaffold structure
 - Drop support for python2
-- Travis deoploy to pypi
+- Travis deploy to pypi
 
 Version 0.6.1
 =============
@@ -47,7 +56,7 @@ Version 0.4
 - Add ERA5 support (download, reading, TS conversion)
 - Add netcdf support for ERA5 and ERA-Interim download (regular grid)
 - Add new grid defintions: netcdf download in regular grid, grib in gaussian grid
-- Add Download with spatial resampling (grib and nc) 
+- Add Download with spatial resampling (grib and nc)
 - Update GRIB message storing (per day instead of per message)
 - Add tests for splitting downloaded files, ERA5 reading, ERA5 reshuffling, generated grids
 - Add new test data