Skip to content

Commit

Permalink
Download updates and reshuffle land points (#23)
Browse files Browse the repository at this point in the history
* Allow reading landpoints only

* Update tests

* Update docs and meta package

* Support download from windows, allow download of any product, reading of spatial subsets

* Clean up

* Fix datedown installer

* Add pytest

* Update code formatting

* Update workflow

* Update workflow

* Update tests and changelog

* Update workflow

* Exclude wget test on windows

* Update readme

* Cleanup
  • Loading branch information
wpreimes committed Sep 27, 2022
1 parent d0e812f commit ba7a112
Show file tree
Hide file tree
Showing 28 changed files with 1,428 additions and 662 deletions.
135 changes: 135 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
# 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:
workflow_dispatch:
schedule:
- cron: '0 0 * * *' # daily

jobs:
build:
name: Build py${{ matrix.python-version }} @ ${{ matrix.os }} 🐍
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10']
os: ["ubuntu-latest"]
include:
- os: "windows-latest"
python-version: '3.10'

steps:
- uses: actions/checkout@v2
with:
submodules: true
fetch-depth: 0
lfs: true
- name: Checkout LFS objects
run: git lfs checkout
- uses: conda-incubator/setup-miniconda@v2.0.1
with:
miniconda-version: "latest"
auto-update-conda: true
python-version: ${{ matrix.python-version }}
environment-file: environment.yml
activate-environment: smap_io
auto-activate-base: false
- name: Print environment 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
filename=env_py${{ matrix.python-version }}_${{ matrix.os }}.yml
conda env export --no-builds | grep -v "prefix" > .artifacts/$filename
- name: Install package and test
env:
SMAPPWD: ${{ secrets.SMAPPWD }}
SMAPUSERNAME: ${{ secrets.SMAPUSERNAME }}
shell: bash -l {0}
# On Windows, wget needs to be installed properly first, not tested here
run: |
pip install -e .
if [ ${{ matrix.os }} == "windows-latest" ]
then
pytest --cache-clear -m "not wget"
else
pytest --cache-clear
fi
- 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: |
git status
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 }} # this needs to be uploaded to github actions secrets
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ cover/*
MANIFEST

#others
*/_local_scripts/*
wget-log
src/smap_io/_local_scripts/*
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "tests/smap_io-test-data"]
path = tests/smap_io-test-data
url = https://www.geo.tuwien.ac.at/downloads/gittd/smap_io-test-data.git/
url = https://git.geo.tuwien.ac.at/public_projects/rs/rs_testdata/smap_io-test-data.git
62 changes: 0 additions & 62 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ Unreleased
==========
-

Version 0.5
===========
- Add support to download all smap products and test actual download
- Allow reshuffling land points only (SPL3SMP)
- Allow reshuffling points in bounding box only (SPL3SMP)
- Testdata module is now using GitLFS and hosted at TUW
- Meta package follows pyscaffold 4 standards, yapf formatting added

Version 0.4
===========
- Switch to new pyscaffold structure
Expand Down
Loading

0 comments on commit ba7a112

Please sign in to comment.