Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
mmacata committed May 4, 2021
2 parents efd599c + 676fb28 commit 3d150ac
Show file tree
Hide file tree
Showing 31 changed files with 2,406 additions and 215 deletions.
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ per-file-ignores =
./actinia_core/main.py: F401
./actinia_core/resources/common/process_queue.py: F401
./actinia_core/resources/common/process_chain.py: W605
./actinia_core/resources/common/interim_results.py: W605
./actinia_core/resources/common/list_grass_modules.py: F821
./actinia_core/resources/common/aws_sentinel_interface.py: E501
342 changes: 342 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,342 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

Types of changes

* __Added__ for new features.
* __Changed__ for changes in existing functionality.
* __Deprecated__ for soon-to-be removed features.
* __Removed__ for now removed features.
* __Fixed__ for any bug fixes.
* __Security__ in case of vulnerabilities.


## [Unreleased]
TODO https://github.com/mundialis/actinia_core/compare/0.99.27...master


# 0.99.X

----------- autogenerated below - to change content, change release notes and recreate with command at end of this file ------------

## [0.99.27.79] - 2021-04-13
released from grass79
* GHA Tests (#166)
* update actinia-module-plugin version (https://github.com/mundialis/actinia-module-plugin/releases/tag/2.0.0)

## [0.99.27] - 2021-04-13
released from master
* GHA Tests (#166)
* update actinia-module-plugin version (https://github.com/mundialis/actinia-module-plugin/releases/tag/2.0.0)

## [0.99.26.79] - 2021-04-01
released from grass79
* ace, importer, exporter: move out to separate repos (#160)
* replace webhook pw with XXX (#163)
* allow redis config via environment variable (#164)

## [0.99.26] - 2021-04-01
released from master
* use non-root user for prod docker example (#155)
* ace, importer, exporter: move out to separate repos (#160)
* replace webhook pw with XXX (#163)
* allow redis config via environment variable (#164)

## [0.99.25.79] - 2021-03-19
released from grass79
- fix landsat test (#159)
- actinia export formats: minor cleanup (#157)

## [0.99.25] - 2021-03-19
released from master
- fix landsat test (#159)
- actinia export formats: minor cleanup (#157)

## [0.99.24] - 2021-03-11
released from master
- Fix several misspelled words (#152)
- Don't use mutable default arguments when avoidable (#153)
- Enhance redis connection error logging + fixes clear text passwords (#154)
- Update tutorial to new ace version
- Monitoring of mapset size of a resource (#150)
- new mapset size analysis endpoints
- Flake8 linting (#146)
- Fix missing import of logging.handlers (#156)

## [0.99.23] - 2021-03-08
released from master
Add stdout as `process_result` for endpoint `locations/{location}}/mapset/{mapset}/processing_async` (#149)
## Warning
Due to a backporting issue, the `alpine` and `ubuntu` versions of `actinia_core:0.99.23` have a problem in the output of `g.proj -ulgp` where corner coordinates in degrees (`nw_long` etc.) will have very large values or `inf`. This is fixed in version `0.99.24`

## [0.99.22.79] - 2021-02-25
released from grass79
* Split actinia-gdi into multiple plugins
* Save interim results

## [0.99.22] - 2021-02-25
released from master
- Split actinia-gdi into multiple plugins
- Update deployment + dev setup for plugins (#147)
- docker: update module-plugin (#148)

## [0.99.21.79] - 2021-02-16
released from grass79
~~Save interim results~~

## [0.99.21] - 2021-02-16
released from master
- Save interim results (#137)

## [0.99.20] - 2021-02-16
released from master
- Update snappy version to 8.0.1 (#145)

## [0.99.20.79] - 2021-02-16
released from grass79
Update snappy version

## [0.99.19] - 2021-01-22
released from master
* repair actinia-user (#136)
* update docker readme and setup (#138)
* GHA: add flake8 tests (#140)
* PEP8 fixes (#139), (#142)
* GRASS GIS updates, including json parser: fix mapsets in tokenizing (#1252)

## [0.99.18.79] - 2020-12-22
released from grass79
* more version information
* Ubuntu image update

## [0.99.18] - 2020-12-22
released from master
- docker: update of base image to Ubuntu 20.04 (#128)
- Create codeql-analysis.yml (#129)
- Enhance version output (#132)
- Docker enhancements (#133)
- clean version
- update log level + paths

## [0.99.17.79] - 2020-12-16
released from grass79
Release with GRASS GIS 7.9

## [0.99.17] - 2020-12-15
released from master
## Fixed
- vector_layers add zone to properties (#126)

## [0.99.16.79] - 2020-12-11
released from grass79
Same as 0.99.15 but based on GRASS GIS 7.9
- Nothing changed in actinia but GRASS GIS (libgis: fix reading of WKT and SRID https://github.com/OSGeo/grass/commit/9c9d19ecccc54db369edad9fd72e9fb5121af6ae)

## [0.99.15.79] - 2020-12-03
released from grass79
Same as 0.99.15 but based on GRASS GIS 7.9

## [0.99.15] - 2020-12-03
released from master
- Update GRASS GIS because of g.extension branch parameter
- Move requirements-alpine.txt to requirements.txt (#125)

## [0.99.14-g79] - 2020-11-18
released from grass79
Same as 0.99.14 but based on GRASS GIS 7.9

## [0.99.14] - 2020-11-18
released from master
- Tests running inside docker build (#120)
- start.sh: silence error when GRASS GIS DB already created (#123)
- enhance documentation (#122)
- Pin versions for proj-using python libs (#124)

## [0.99.13] - 2020-10-23
released from master
- PEP8 fixes (#113)
- Merge Ubuntu docker folders to g78 (#116)
- Fix docker folder names (#117)
- update gitignore and readd ubuntu config (#118)
- update snap version to 8.0 (#121)

## [0.99.12] - 2020-09-29
released from master
- add colorlog and psutil to ubuntu19 requirements (#103)
- Fix groups (#102), (#104)
- return codes: explanations added (#107)
- Fix PEP8 errors and warnings (#109)
- PEP8: fix E225 missing whitespace around operator (#110)
- PEP8: fix various indentation errors (#111)
- PEP8: fix errors (#112)
- raster_exporter: COG support added (#108)

## [0.99.11] - 2020-08-24
released from master
- webhook status can be 200 and 204 (#100)
## Fixed
- group (in persistent processing) - add group to copied directories (#101)


## [0.99.10] - 2020-08-04
released from master
## Fixed
- allow webhook pw with colon (#98)
- webhook pw with colon (#99)

## [0.99.9] - 2020-07-30
released from master
- use actinia-gdi version 0.1.8
- fix gdal for ubuntu docker (#90)
- update version in actinia-gdi alpine Dockerfile (0.1.9, 0.1.10, 0.1.11) (#91), (#93), (#94)
- docker: alpine version 3.12 (#92)
- add psutil to get the used/total memory (#95)
- add py3-joblib after requirements (#96)
- Update requirements.txt and add few tests (#97)

## [latest] - 2020-05-13
released from master

## [0.99.8] - 2020-05-13
released from master
## Fixed
- Fix missing openeo-addons repo cloning (#88)
- Messages: fix Sentinel 2A to Sentinel-2 (#87)
### Added
- Stdout Logger with optional colored or json formatter - Enable stdout logging (#47)

## [0.99.7] - 2020-04-16
released from master
- Switch alpine docker to alpine 3.11 and compiled pdal (#84)
- exporter: generate overviews with LZW compression (#85)
- use s1 toolbox from snappy only (#86)
- update actinia-gdi version in Dockerfile (0.1.6, 0.1.7) (add filtering of variables with default values)

## [0.99.6] - 2020-03-05
released from master
## Fixed
- cancel/termination operation for redis version >= 3.0.0 #83

## [0.99.5] - 2020-02-18
released from master
- Includes all addons from CSV in alpine dockerimage - Sync grass_addons_list.csv in Dockerfiles (#81)

## [0.99.4] - 2020-02-06
released from master
CI release

## [0.99.3] - 2020-02-06
released from master
- added band_reference and band_reference for image collections (GRASS GIS 7.9+) (#70)
- set ACTINIA_CUSTOM_TEST_CFG to standard actinia cfg dir
- torch dependency: avoid hardcoded version (#72)
- actinia: change base image to grass-py3-pdal:stable-ubuntu19 (#73)
- back to hardcoded torch version but now py3.7 based
- fix enum (#71)
- fix missing comma (#74)
- actinia-latest/Ubuntu19: use own requirements_ubuntu19.txt (#75)
- use loop to install grass addons (#76)
- Enhance Docker README, docker and requirements.txt
- Update to Ubuntu19 (#77)
- Adjust to google_cloud_bigquery update (#78)
- Remove timeout from gc-bigquery after API change (#79)
- Dockerfile rewrite for Alpine (#55)
- add openeo addons in dockerfile (#80)

## [v0.99.2] - 2019-11-28
released from master
- Update to new @ URL delimiter character (#61)
- fix ace for e.g. column='z_antenna double precision' parsing (#62)
- Enforce pyproj==1.9.6 for PROJ 4.9.3
- GRASS addons: v.out.png replaced with r.colors.out_sld
- use csv to install GRASS GIS addons in a loop (#65)
- exporter: added TILED=YES and overviews=5
- exporter: added overviews (2, 4, 8, 16) to raster (#66)
- actinia docker image based on GRASS GIS 7.9 (master) (#67)
- exporter: support attributes at raster export (GDAL RAT) (#68)
- snappy:
- SNAP updated to Version 7.0 (#63)
- increase java_max_mem to avoid NullPointer exception for snappy (#64)
- include current folder '.' in LD_LIBRARY_PATH for SNAP

## [v0.99.1] - 2019-10-31
released from master
- fix version to not be dirty after release (#59)

## [v0.99.0] - 2019-10-31
released from master
- Enhance READMEs, examples and docker setup
- execute tests after actinia installation
- optimize gunicorn startup options (#41)
- fix actinia curl examples (#58)
- table of ACL added (#44)
- added api docs for user management (#48)
- use copy instead of git pull in Dockerfile (#50)
- make base dockerimage explicit (grass78) (#56)
- update build context in docker-compose (#52)
- Renaming of remaining GRaaS/graas to actinia (#43)
- added missing global_config.WORKER_LOGFILE
- Fix GRASS GIS and Python version (#45)
- make swagger docs of AsyncPersistentResource reusable (#49)
- use git tag for actinia version (#57)

-----------end of autogeneration ---------------------

# 0.2.X

## [v0.2.2] - 2019-09-26 - geopackage-release
released from master
mainly cleanup of documentation and tests, especially for location names.
And support of GeoPackage for importer and exporter!!

TODO: enhance description https://github.com/mundialis/actinia_core/compare/v0.2.1...v0.2.2

## [v0.2.1] - 2019-05-14
released from master
- let redis use a password in v0.2.1

## [v0.2.0] - 2019-03-12
released from master
- use python3 for GRASS in v0.2

# 0.1.X

## [v0.1.1] - 2019-03-01
released from master
- last release with python2 for GRASS support

## [python3] - 2019-03-01
released from master
- merge actinia and grass python requirements for python3

## [v0.1.0] - 2019-01-24
released from master
- ace and fire

# 0.0.X

## [v0.0.7] - 2018-07-16
released from master
- Fixed webhook and Addonpath in v 0.0.7

## [v0.0.6] - 2018-07-13
released from master
- Add GRASS Addon support in v 0.0.6

## [v0.0.5] - 2018-07-10
released from master
- More webhooks + postgis export in v 0.0.5


-----
Autogenerated with:
```
curl https://api.github.com/repos/mundialis/actinia_core/releases?per_page=50 | jq -r '.[] | "## [\(.tag_name)] - \(.published_at | strptime("%Y-%m-%dT%H:%M:%SZ") | strftime("%Y-%m-%d"))\nreleased from \(.target_commitish)\n\(.body) \n"'
```
After that, few releases need to be sorted correctly.

Sorting is not 100% correct, default is per publish date and `?order_by=created_at` doesn't behave as expected.
TODO: use created_at or published_at?
10 changes: 0 additions & 10 deletions CHANGELOG.rst

This file was deleted.

6 changes: 3 additions & 3 deletions docker/actinia-core-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM mundialis/grass-py3-pdal:latest-alpine as grass
FROM mundialis/esa-snap:s1tbx-8.0.1 as snap
FROM mundialis/esa-snap:s1tbx-8.0.3 as snap
FROM mundialis/actinia-core:alpine-build-pkgs_v7 as build

LABEL authors="Carmen Tawalika,Anika Bettge,Markus Neteler,Sören Gebbert"
Expand Down Expand Up @@ -65,8 +65,8 @@ RUN curl https://api.github.com/repos/mundialis/actinia_satellite_plugin/release
RUN curl https://api.github.com/repos/mundialis/actinia-metadata-plugin/releases/38726425 > resp.json && \
name=`cat resp.json | jq '.assets[0].name' | tr -d '"'` && \
cat resp.json | jq '.assets[0].browser_download_url' | xargs curl -L --output /build/$name && rm resp.json
# Get actinia-module-plugin (41350425 = 2.0.0)
RUN curl https://api.github.com/repos/mundialis/actinia-module-plugin/releases/41350425 > resp.json && \
# Get actinia-module-plugin (42252895 = 2.1.0)
RUN curl https://api.github.com/repos/mundialis/actinia-module-plugin/releases/42252895 > resp.json && \
name=`cat resp.json | jq '.assets[0].name' | tr -d '"'` && \
cat resp.json | jq '.assets[0].browser_download_url' | xargs curl -L --output /build/$name && rm resp.json
# Install actinia-core and plugins
Expand Down
3 changes: 2 additions & 1 deletion scripts/actinia-server
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ def main():
# Connect the redis interfaces
redis_args = (global_config.REDIS_SERVER_URL,
global_config.REDIS_SERVER_PORT)
if global_config.REDIS_SERVER_PW and global_config.REDIS_SERVER_PW is not None:
if (global_config.REDIS_SERVER_PW
and global_config.REDIS_SERVER_PW is not None):
redis_args = (*redis_args, global_config.REDIS_SERVER_PW)

connect(*redis_args)
Expand Down
Loading

0 comments on commit 3d150ac

Please sign in to comment.