Skip to content

Commit 0310d55

Browse files
authored
Merge pull request #773 from sentinel-hub/develop
Release version 1.5.2
2 parents e93682c + 0fdde01 commit 0310d55

File tree

86 files changed

+319
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+319
-221
lines changed

.github/workflows/ci_action.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ jobs:
4747
uses: actions/setup-python@v4
4848
with:
4949
python-version: "3.8"
50-
# cache: pip # uncomment when all requirements are in `pyproject.toml`
51-
# caching the entire environment is faster when cache exists but slower for cache creation
50+
cache: pip
5251

5352
- name: Install packages
5453
run: pip install .[DEV] --upgrade --upgrade-strategy eager
@@ -111,19 +110,3 @@ jobs:
111110
files: coverage.xml
112111
fail_ci_if_error: true
113112
verbose: false
114-
115-
mirror-and-integration-test-on-gitlab:
116-
if: github.event_name == 'push'
117-
runs-on: ubuntu-latest
118-
steps:
119-
- uses: actions/checkout@v1
120-
- name: Mirror + trigger CI
121-
uses: SvanBoxel/gitlab-mirror-and-ci-action@master
122-
with:
123-
args: "https://git.sinergise.com/eo/code/eo-learn/"
124-
env:
125-
GITLAB_HOSTNAME: "git.sinergise.com"
126-
GITLAB_USERNAME: "github-action"
127-
GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
128-
GITLAB_PROJECT_ID: "164"
129-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci_trigger.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: mirror_and_trigger
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "master"
8+
- "develop"
9+
workflow_call:
10+
release:
11+
types:
12+
- published
13+
14+
jobs:
15+
mirror-and-integration-test-on-gitlab:
16+
if: github.event_name == 'push'
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v1
20+
- name: Mirror + trigger CI
21+
uses: SvanBoxel/gitlab-mirror-and-ci-action@master
22+
with:
23+
args: "https://git.sinergise.com/eo/code/eo-learn/"
24+
env:
25+
FOLLOW_TAGS: "true"
26+
GITLAB_HOSTNAME: "git.sinergise.com"
27+
GITLAB_USERNAME: "github-action"
28+
GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
29+
GITLAB_PROJECT_ID: "164"
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitlab-ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ image: python:3.9
22

33
stages:
44
- test
5+
- build
56

67
run_sh_integration_tests:
78
stage: test
@@ -13,3 +14,17 @@ run_sh_integration_tests:
1314
- pip install .[DEV]
1415
- sentinelhub.config --sh_client_id "$SH_CLIENT_ID" --sh_client_secret "$SH_CLIENT_SECRET" > /dev/null # Gitlab can't mask SH_CLIENT_SECRET in logs
1516
- pytest -m sh_integration
17+
18+
build_docker_image:
19+
stage: build
20+
needs: []
21+
rules:
22+
- if: $CI_COMMIT_TAG # run only on releases
23+
when: always
24+
variables:
25+
CUSTOM_RUN_TAG: auto # this will create images with the latest tag and the version tag
26+
LAYER_NAME: dotai-eo
27+
- when: manual
28+
trigger:
29+
project: eo/infra/docker
30+
allow_failure: true

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ repos:
1313
- id: debug-statements
1414

1515
- repo: https://github.com/psf/black
16-
rev: 23.9.1
16+
rev: 23.10.1
1717
hooks:
1818
- id: black
1919
language_version: python3
2020

2121
- repo: https://github.com/charliermarsh/ruff-pre-commit
22-
rev: "v0.0.292"
22+
rev: "v0.1.4"
2323
hooks:
2424
- id: ruff
2525

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [Version 1.5.2] - 2023-11-07
2+
3+
- `RayExecutor` can now forward remote kwargs to ray jobs.
4+
- `ImportTiffTask` no longer uses the `use_vsi` parameter. The IO part was fully off-loaded to `rasterio`.
5+
- `ImportTiffTask` and `ExportTiffTask` parameter `folder` was renamed to `path`. The renaming is backwards compatible for now.
6+
7+
18
## [Version 1.5.1] - 2023-10-17
29

310
- `MorphologicalFilterTask` adapted to work on boolean values.

eolearn/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Main module of the `eolearn` package."""
2-
__version__ = "1.5.1"
2+
3+
__version__ = "1.5.2"
34

45
import importlib.util
56
import warnings

eolearn/core/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
The following objects and functions are the core of eo-learn package
33
"""
4+
45
from .constants import FeatureType, OverwritePermission
56
from .core_tasks import (
67
AddFeatureTask,

eolearn/core/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
77
This source code is licensed under the MIT license, see the LICENSE file in the root directory of this source tree.
88
"""
9+
910
from __future__ import annotations
1011

1112
import warnings

eolearn/core/core_tasks.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
77
This source code is licensed under the MIT license, see the LICENSE file in the root directory of this source tree.
88
"""
9+
910
from __future__ import annotations
1011

1112
import copy

eolearn/core/eodata.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
77
This source code is licensed under the MIT license, see the LICENSE file in the root directory of this source tree.
88
"""
9+
910
from __future__ import annotations
1011

1112
import concurrent.futures

0 commit comments

Comments
 (0)