Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "daily"
allow:
- dependency-name: "blend-modes"
- dependency-name: "click"
- dependency-name: "croniter"
- dependency-name: "lxml"
- dependency-name: "mapchete[complete]"
- dependency-name: "opencv-python"
- dependency-name: "Pillow"
- dependency-name: "pydantic"
- dependency-name: "pystac[urllib3]"
- dependency-name: "pystac-client"
- dependency-name: "retry"
- dependency-name: "rtree"
- dependency-name: "scipy"
- dependency-name: "tqdm"
- dependency-name: "xarray"
63 changes: 63 additions & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# This workflow will install Python dependencies, run tests and lint 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: Python package test

on:
push:
branches: [main]
pull_request:
branches: [main]
schedule:
- cron: '0 8 * * 1,4'

permissions:
pull-requests: write
contents: read

jobs:
test:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
python-version: ["3.10", "3.11", "3.12"]
os: ["ubuntu-24.04", "ubuntu-latest"]

steps:
- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Lint
run: |
python -m pip install pre-commit
pre-commit run --show-diff-on-failure --all-files

- name: Install dependencies
env:
CURL_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
run: |
sudo apt-add-repository -y ppa:ubuntugis/ubuntugis-unstable
sudo apt-get -y update
sudo apt-get install -y gdal-bin libgdal-dev libproj-dev libgeos-dev
python -m pip install --upgrade pip wheel
pip install -e .
pip install -e .[test]
pip freeze

# run tests
- name: run
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REQUEST_PAYER: ${{ vars.AWS_REQUEST_PAYER }}
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
CDSE_S3_ACCESS_KEY: ${{ secrets.CDSE_S3_ACCESS_KEY }}
CDSE_S3_ACCESS_SECRET: ${{ secrets.CDSE_S3_ACCESS_SECRET }}
CURL_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
run: pytest -v --cov mapchete-eo --cov-report xml:coverage.xml --cov-report=term-missing:skip-covered
31 changes: 31 additions & 0 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflows will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: Upload Python Package

on:
release:
types: [created]

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install hatch
- name: Build and publish
env:
HATCH_INDEX_USER: __token__
HATCH_INDEX_AUTH: ${{ secrets.PYPI_TOKEN }}
run: |
hatch build
hatch publish
103 changes: 0 additions & 103 deletions .gitlab-ci.yml

This file was deleted.

26 changes: 24 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,36 @@ Changelog
#########


2025.7.0 - 2025-07-30
----------------------

* Migrated public repository at: `https://github.com/mapchete/mapchete-eo`
* Package name changed from `mapchete_eo` to `mapchete-eo`; python module still with underscore `from mapchete_eo import *`
* Dropped support and tests for `python 3.9`

* core

* added/implemented `CDSESearch(STACSearchCatalog)` as search
* added following archive options to utilize the CDSE seach, the `S2CDSE_AWSJP2` searches at CDSE, but reads from `AWS Open Data Sentinel-2`,
`S2CDSE_JP2` searches and reads data both from CDSE (needs to have correct asset names given for reading):

* `S2CDSE_AWSJP2 = AWSL2AJP2CSDE`
* `S2CDSE_JP2 = CDSEL2AJP2CSDE`

* CI/CD

* `.github/workflows/` for running tests and publishing the `mapchete-eo` releases via hatch to `pypi`
* removed double dependency files, now dependencies are defined in `pyproject.toml`


2025.5.0 - 2025-05-19
----------------------

* core

* set `clip_to_crs_bounds=False` in `reproject_geometry` of `platforms.sentinel2.product` `footprint_nodata_mask()` as if clipped and at CRS border it will for some reason clip products; this make footprits too large or missprojected
* set `clip_to_crs_bounds=False` in `reproject_geometry` of `platforms.sentinel2.product` `footprint_nodata_mask()` as if clipped and at CRS border it will for some reason clip products; this make footprints too large or missprojected
* This can also be due to smaller CRS bounds (from `pyproj`) than mapchete Grid Pyramid definition
* use `|` in `platforms.sentinel2.product` `get_mask()` fuction to preserve `bool` types while going through masks
* use `|` in `platforms.sentinel2.product` `get_mask()` function to preserve `bool` types while going through masks
* fix `first` Slice product reading logic, also make `average` for read_products and `all` for `read_masks` to only use products that are not fully masked

* CI/CD
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2022 - 2024 EOX IT Services
Copyright (c) 2022 - 2025 EOX IT Services

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion mapchete_eo/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2025.5.0"
__version__ = "2025.7.0"
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ classifiers = [
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering :: GIS",
]
dependencies = [
"blend-modes",
"click",
"croniter",
"lxml",
"mapchete>=2025.6.0",
"mapchete[complete]>=2025.6.0",
"opencv-python",
"orgonite",
"Pillow",
"pydantic",
"pystac[urllib3]>=1.12.2",
Expand Down
2 changes: 1 addition & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
markers =
remote: marks tests which require acces to remote resources (deselect with '-m "not remote"')
use_cdse_test_env: enables CDSE S3 environment access
addopts = --durations 20 --verbose --nf --cov=mapchete_eo
addopts = --durations 20 --verbose --nf --cov=mapchete-eo --cov-report=term-missing:skip-covered
8 changes: 0 additions & 8 deletions requirements-dev.txt

This file was deleted.

16 changes: 0 additions & 16 deletions requirements.txt

This file was deleted.

Loading