Merge branch 'master' into issue437_better-documentation-of-crs-code-…

…usage

.git-blame-ignore-revs

@@ -13,3 +13,7 @@ cfd2e0d1cb3c270222cd4d2e4b0688da50087494
 # pre-commit end-of-file-fixer and trailing-whitespace
 d7ccd7b57aab823867415a9e75913d14e440ae25
 c4759f2025cf777f761cb508a64e01c5c3ea3e72
+
+# Import cleanups using isort
+9ae624cb536c9aeda35c5e389f5d87e353c22726
+f50c2e18583619f1c67de6c803cd65c0ac2d2f5e

.github/workflows/lint.yml

@@ -1,6 +1,13 @@
 
 name: Lint
-on: [push, pull_request]
+on:
+  push:
+    paths:
+      - '**.py'
+  pull_request:
+    paths:
+      - '**.py'
+concurrency: ci-${{ github.ref }}
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/sphinx2ghpages.yml

@@ -5,6 +5,13 @@ name: Sphinx Documentation to GitHub Pages
 on:
   push:
     branches: [ master ]
+    paths:
+      - 'docs/**'
+      - 'openeo/**'
+
+concurrency:
+  group: docs-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:

.github/workflows/unittests.yml

@@ -1,6 +1,19 @@
 
 name: Unit tests
-on: [push, pull_request]
+on:
+  push:
+    paths:
+      - 'setup.py'
+      - 'pyproject.toml'
+      - 'openeo/**'
+      - 'tests/**'
+  pull_request:
+    paths:
+      - 'setup.py'
+      - 'pyproject.toml'
+      - 'openeo/**'
+      - 'tests/**'
+concurrency: ci-${{ github.ref }}
 jobs:
   build:
     strategy:
@@ -15,8 +28,6 @@ jobs:
           - "3.11"
         # Additional special cases (see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-adding-configurations)
         include:
-          - os: "ubuntu-20.04"
-            python-version: "3.6"
           - os: "windows-latest"
             python-version: "3.11"
     runs-on: ${{ matrix.os }}

CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Bumped minimal supported Python version to 3.7 ([#460](https://github.com/Open-EO/openeo-python-client/issues/460))
+
 ### Fixed
 
 

README.md

@@ -47,7 +47,7 @@ examples and in-depth discussion.
 
 ## Installation
 
-Python 3.6 or higher is required.
+Python 3.7 or higher is required.
 As always, it is recommended to work in some kind of virtual environment
 (using `venv`, `virtualenv`, conda, docker, ...)
 to install the `openeo` package and its dependencies:

docs/api.rst

@@ -126,7 +126,7 @@ openeo.util
 -------------
 
 .. automodule:: openeo.util
-    :members: to_bbox_dict, BBoxDict, load_json_resource, normalize_crs
+    :members: to_bbox_dict, BBoxDict, load_json_resource, normalize_crs, string_to_temporal_extent
 
 
 openeo.processes

docs/installation.rst

@@ -11,7 +11,7 @@ The package is a pure Python implementation and its dependencies are carefully c
 Basic install
 =============
 
-At least *Python 3.6* is recommended.
+At least *Python 3.7* is required (since version 0.23.0).
 Also, it is recommended to work in a some kind of *virtual environment* (``venv``, ``conda``, ...)
 to avoid polluting the base install of Python on your operating system
 or introducing conflicts with other applications.

docs/process_mapping.py

@@ -7,13 +7,12 @@
 
 """
 import datetime
+import importlib
 import sys
 from textwrap import dedent
-import importlib
 
 from openeo.internal.documentation import _process_registry
 
-
 # TODO: automate running of this tool. E.g. use https://nedbatchelder.com/code/cog
 # TODO: support operators properly (use `+` in docs instead of `__add__`)
 

examples/R_example.py

@@ -1,8 +1,8 @@
-import openeo
 import logging
-from openeo.auth.auth_bearer import BearerAuth
 import time
 
+import openeo
+from openeo.auth.auth_bearer import BearerAuth
 
 logging.basicConfig(level=logging.INFO)
 

examples/eodc_example.py

@@ -1,7 +1,8 @@
 import logging
+
 import openeo
-from openeo.rest.job import RESTJob
 from openeo.auth.auth_bearer import BearerAuth
+from openeo.rest.job import RESTJob
 
 logging.basicConfig(level=logging.DEBUG)
 

examples/gee_example.py

@@ -1,6 +1,7 @@
+import logging
+
 import openeo
 from openeo.internal.graph_building import PGNode
-import logging
 
 logging.basicConfig(level=logging.INFO)
 

examples/gee_uc1_temp.py

@@ -1,6 +1,7 @@
-import openeo
 import logging
 
+import openeo
+
 logging.basicConfig(level=logging.INFO)
 
 GEE_DRIVER_URL = "https://earthengine.openeo.org/v1.0"

examples/mundialis_example.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 
 import logging
-import openeo
 import time
 
+import openeo
+
 logging.basicConfig(level=logging.INFO)
 
 backend_url = 'https://openeo.mundialis.de'

examples/mundialis_extended.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 import json
 import logging
+import sys
 from datetime import datetime
 
 import openeo
-import sys
 
 logger = logging.getLogger(__name__)
 

examples/mundialis_mini.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import json
+
 import openeo
 
 backend_url = 'https://openeo.mundialis.de'

examples/ndvi_composite.py

@@ -1,9 +1,10 @@
 import os
 from pathlib import Path
 
-import openeo
 from skimage.morphology import selem
 
+import openeo
+
 connection = openeo.connect("https://openeo-dev.vito.be")
 bbox = {"west": 4.996033, "south": 51.258922, "east": 5.091603, "north": 51.282696}
 connection.authenticate_basic()
@@ -75,6 +76,7 @@ def test_composite_by_udf():
 
 from openeo.rest.datacube import DataCube
 
+
 def test_debug_udf():
     """
     Shows how to run your UDF locally for testing. This method uses the same code as the backend, and can be used to check validity of your UDF.
@@ -86,6 +88,7 @@ def test_debug_udf():
 
 from examples.udf.median_composite import apply_datacube
 
+
 def test_debug_udf_direct_invoke():
     """
     Shows how to run your UDF locally for testing, by invoking the function directly, breakpoints work.

examples/phenology_example.py

@@ -1,10 +1,11 @@
-from shapely.geometry import Polygon
-
-import openeo
 import logging
 import os
 from pathlib import Path
+
 import pandas as pd
+from shapely.geometry import Polygon
+
+import openeo
 
 #enable logging in requests library
 logging.basicConfig(level=logging.DEBUG)

examples/profiling_example.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-from pathlib import Path
-import openeo
+import pstats
 import tarfile
 import tempfile
-import pstats
+from pathlib import Path
 
+import openeo
 
 if __name__ == '__main__':
 

examples/py3_process_wrapper-wcps_eurac.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 import json
 import logging
+import sys
 from datetime import datetime
 
 import openeo
-import sys
 
 logger = logging.getLogger(__name__)
 

examples/udf/median_composite.py

@@ -1,5 +1,5 @@
-import xarray
 import numpy as np
+import xarray
 
 from openeo.udf import XarrayDataCube
 

examples/vito_example.py

@@ -1,6 +1,7 @@
-import openeo
-import logging
 import json
+import logging
+
+import openeo
 
 logging.basicConfig(level=logging.INFO)
 

openeo/__init__.py

@@ -12,9 +12,8 @@ class BaseOpenEoException(Exception):
 
 
 from openeo._version import __version__
-
-from openeo.rest.datacube import DataCube, UDF
-from openeo.rest.connection import connect, session, Connection
+from openeo.rest.connection import Connection, connect, session
+from openeo.rest.datacube import UDF, DataCube
 from openeo.rest.job import BatchJob, RESTJob
 
 

openeo/api/process.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import warnings
 from typing import Union
 
@@ -35,7 +37,7 @@ def to_dict(self) -> dict:
         return d
 
     @classmethod
-    def raster_cube(cls, name: str = "data", description: str = "A data cube.") -> 'Parameter':
+    def raster_cube(cls, name: str = "data", description: str = "A data cube.") -> Parameter:
         """
         Helper to easily create a 'raster-cube' parameter.
 
@@ -46,7 +48,7 @@ def raster_cube(cls, name: str = "data", description: str = "A data cube.") -> '
         return cls(name=name, description=description, schema={"type": "object", "subtype": "raster-cube"})
 
     @classmethod
-    def datacube(cls, name: str = "data", description: str = "A data cube.") -> "Parameter":
+    def datacube(cls, name: str = "data", description: str = "A data cube.") -> Parameter:
         """
         Helper to easily create a 'datacube' parameter.
 
@@ -59,7 +61,7 @@ def datacube(cls, name: str = "data", description: str = "A data cube.") -> "Par
         return cls(name=name, description=description, schema={"type": "object", "subtype": "datacube"})
 
     @classmethod
-    def string(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED, values=None) -> 'Parameter':
+    def string(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED, values=None) -> Parameter:
         """Helper to create a 'string' type parameter."""
         schema = {"type": "string"}
         if values is not None:
@@ -68,21 +70,21 @@ def string(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED,
 
 
     @classmethod
-    def integer(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED) -> 'Parameter':
+    def integer(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED) -> Parameter:
         """Helper to create a 'integer' type parameter."""
         return cls(name=name, description=description, schema={"type": "integer"}, default=default)
 
     @classmethod
-    def number(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED) -> 'Parameter':
+    def number(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED) -> Parameter:
         """Helper to create a 'number' type parameter."""
         return cls(name=name, description=description, schema={"type": "number"}, default=default)
 
     @classmethod
-    def boolean(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED) -> 'Parameter':
+    def boolean(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED) -> Parameter:
         """Helper to create a 'boolean' type parameter."""
         return cls(name=name, description=description, schema={"type": "boolean"}, default=default)
 
     @classmethod
-    def array(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED) -> 'Parameter':
+    def array(cls, name: str, description: str = None, default=_DEFAULT_UNDEFINED) -> Parameter:
         """Helper to create a 'array' type parameter."""
         return cls(name=name, description=description, schema={"type": "array"}, default=default)

openeo/capabilities.py

@@ -1,8 +1,9 @@
+from __future__ import annotations
+
 import contextlib
-from abc import ABC
 import re
-from typing import Union, Tuple
-
+from abc import ABC
+from typing import Tuple, Union
 
 # TODO Is this base class (still) useful?
 
@@ -24,7 +25,7 @@ def api_version(self) -> str:
         raise NotImplementedError
 
     @property
-    def api_version_check(self) -> 'ComparableVersion':
+    def api_version_check(self) -> ComparableVersion:
         """Helper to easily check if the API version is at least or below some threshold version."""
         api_version = self.api_version()
         if not api_version: