Skip to content

Commit 2f46a93

Browse files
javgatjavgat
committed
Merge branch 'develop' into 'master'
v1.3.0 See merge request eco/eo/lime_tbx!89
2 parents 892d698 + d79f0d3 commit 2f46a93

108 files changed

Lines changed: 1899 additions & 341 deletions

File tree

Some content is hidden

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

‎.github/halted_workflows/full-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
mkdir test_report
3535
source .venv/bin/activate
3636
export GITLAB_CI="GITLAB_CI"
37-
tox -- --runslow
37+
tox -- --runslow -m slow
3838
- name: Upload test report
3939
uses: actions/upload-artifact@v4
4040
with:

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ tox_slowtests:
139139
- pip install tox
140140
- mkdir test_report
141141
- export GITLAB_CI="GITLAB_CI"
142-
- tox -- --runslow
142+
- tox -- --runslow -m slow
143143
coverage: '/^TOTAL.+?(\d+\%)$/'
144144
needs: []
145145
only:
@@ -158,7 +158,7 @@ tox_slowtests_manual:
158158
- pip install tox
159159
- mkdir test_report
160160
- export GITLAB_CI="GITLAB_CI"
161-
- tox -- --runslow
161+
- tox -- --runslow -m slow
162162
coverage: '/^TOTAL.+?(\d+\%)$/'
163163
needs: []
164164
rules:

‎CHANGELOG.md‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
[//]: # "## [unreleased] - yyyy-mm-dd"
99

10+
## [1.3.0] - 2025-09-19
11+
12+
### Added
13+
14+
- Filter 3σ: Option in the Comparison page to filter out measurements that are more than 3σ away
15+
from the mean relative difference. Filtering is done channel-wise.
16+
- Multiple Selenographic Points: Support for loading multiple selenographic coordinates at once
17+
via CSV file input in the selenographic input tab.
18+
19+
### Changed
20+
21+
- Updated EO-CFI library dependencies to version 4.29 and recompiled EO-CFI dependent binaries.
22+
1023
## [1.2.2] - 2025-07-21
1124

1225
### Changed
@@ -82,14 +95,14 @@ correctly in such cases.
8295
- Timeseries input file now also accepts regular format timestamps, not only CSV.
8396
- Added METOP-A, METOP-B and METOP-C data (TLE/3LE). METOP-B and METOP-C will need to be periodically updated.
8497
- Updated TLE/3LE data for PLEIADES 1A, PLEIADES 1B and PROBA-V, now covering the period from their launch until 2025-04-14.
85-
- Updated EO-CFI library dependencies to version 4.28.
8698

8799
### Changed
88100

89101
- Drop support for Python 3.8.
90102
- Provide support for Python 3.11 and 3.12.
91103
- Updated library dependencies and versions.
92104
- Refactored main Python package grouping subpackages in layer architecture based packages.
105+
- Updated EO-CFI library dependencies to version 4.28 and recompiled EO-CFI dependent binaries.
93106

94107
### Fixed
95108

@@ -113,7 +126,9 @@ calculations compared to v1.0.3. (**NFR306**)
113126

114127
Initial version that serves as the baseline for tracking changes in the change log.
115128

116-
[unreleased]: https://github.com/LIME-ESA/lime_tbx/compare/v1.2.1...HEAD
129+
[unreleased]: https://github.com/LIME-ESA/lime_tbx/compare/v1.3.0...HEAD
130+
[1.3.0]: https://github.com/LIME-ESA/lime_tbx/compare/v1.2.2...1.3.0
131+
[1.2.2]: https://github.com/LIME-ESA/lime_tbx/compare/v1.2.1...1.2.2
117132
[1.2.1]: https://github.com/LIME-ESA/lime_tbx/compare/v1.2.0...1.2.1
118133
[1.2.0]: https://github.com/LIME-ESA/lime_tbx/compare/v1.1.0...v1.2.0
119134
[1.1.0]: https://github.com/LIME-ESA/lime_tbx/compare/v1.0.3...v1.1.0

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Version 1.2.2](https://img.shields.io/badge/version-1.2.2-informational?style=for-the-badge)](https://github.com/LIME-ESA/lime_tbx/tags)
1+
[![Version 1.3.0](https://img.shields.io/badge/version-1.3.0-informational?style=for-the-badge)](https://github.com/LIME-ESA/lime_tbx/tags)
22
[![License: LGPL 3.0][license-shield]][license-url]
33
[![Issues][issues-shield]][issues-url]
44
[![Stargazers][stars-shield]][stars-url]

‎deployment/automatic/Linux.Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ RUN apt-get -f install -y
7979

8080
WORKDIR /usr/src/app
8181

82-
CMD ["./repo/deployment/automatic/ubuntu_build_script.sh"]
82+
ENTRYPOINT ["./repo/deployment/automatic/ubuntu_build_script.sh"]
8383
# docker build ../.. -t lime_compiler -f Linux.Dockerfile
84-
# docker run -v $(dirname $(dirname $(pwd))):/usr/src/app/repo lime_compiler
84+
# docker run --rm -v $(dirname $(dirname $(pwd))):/usr/src/app/repo lime_compiler --pkg
85+
# It can be --pkg, --c, or --all

‎deployment/automatic/Windows.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ WORKDIR "C:\\"
3434
ENTRYPOINT .\repo\deployment\automatic\windows_build_script.bat
3535
#docker build .. -t lime_compiler -f Windows.Dockerfile
3636
#for %F in ("%cd%\..") do set dirname=%~dpF
37-
#docker run -v %dirname%:C:\repo lime_compiler
37+
#docker run --rm -v %dirname%:C:\repo lime_compiler

‎deployment/automatic/mac_build_script.sh‎

Lines changed: 71 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,72 @@
11
#!/usr/bin/env zsh
2-
# C code (EOCFI)
3-
cd lime_tbx/business/eocfi_adapter/eocfi_c
4-
cp MakefileDarwin.mak Makefile
5-
make
6-
cd ../../../..
7-
# python code
8-
# python3.9 is the manually installed, we avoid using the builtin one
9-
rm -rf lime_tbx.egg-info dist build
10-
python3.9 -m build
11-
rm -rf .venv
12-
python3.9 -m venv .venv
13-
.venv/bin/pip install -r requirements.txt
14-
.venv/bin/pip install PySide2~=5.15
15-
export MACOSX_DEPLOYMENT_TARGET=10.15
16-
pyinstaller lime_tbx.spec
17-
cd deployment/installer && ./build_mac_installer.sh
2+
set -euo pipefail
3+
4+
MODE="pkg"
5+
6+
usage() {
7+
cat <<EOF
8+
Usage: $0 [--c | --pkg | --all]
9+
10+
--c Only compile EO-CFI C code (macOS/Darwin)
11+
--pkg Only package Python app (without compiling EO-CFI C code) [default]
12+
--all Compile EO-CFI C code and package Python app
13+
EOF
14+
}
15+
16+
parse_args() {
17+
while [[ $# -gt 0 ]]; do
18+
case "$1" in
19+
--c) MODE="c"; shift ;;
20+
--pkg) MODE="pkg"; shift ;;
21+
--all) MODE="all"; shift ;;
22+
-h|--help) usage; exit 0 ;;
23+
*) echo "Unknown option: $1"; usage; exit 1 ;;
24+
esac
25+
done
26+
}
27+
28+
compile_c() {
29+
echo "[build] Compiling C code (EO-CFI) for macOS..."
30+
cd lime_tbx/business/eocfi_adapter/eocfi_c
31+
cp MakefileDarwin.mak Makefile
32+
make
33+
cd ../../../..
34+
}
35+
36+
package_python() {
37+
echo "[build] Packaging Python app for macOS..."
38+
rm -rf lime_tbx.egg-info dist build
39+
# python3.9 is the manually installed, we avoid using the builtin one
40+
python3.9 -m build
41+
rm -rf .venv
42+
python3.9 -m venv .venv
43+
.venv/bin/pip install -r requirements.txt
44+
.venv/bin/pip install "PySide2~=5.15"
45+
export MACOSX_DEPLOYMENT_TARGET=10.15
46+
pyinstaller lime_tbx.spec
47+
cd deployment/installer
48+
./build_mac_installer.sh
49+
cd ../..
50+
}
51+
52+
main() {
53+
parse_args "$@"
54+
55+
case "$MODE" in
56+
c)
57+
compile_c
58+
;;
59+
pkg)
60+
# Skipping C compilation is done to avoid dirty tag version.
61+
echo "WARNING: Skipping C compilation during packaging"
62+
echo "C code is NOT compiled in this package build!"
63+
package_python
64+
;;
65+
all)
66+
compile_c
67+
package_python
68+
;;
69+
esac
70+
}
71+
72+
main "$@"

‎deployment/automatic/ubuntu_build_script.sh‎

Lines changed: 77 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,77 @@
1-
#!/usr/bin/env sh
2-
cd repo
3-
# C code (EOCFI)
4-
cd lime_tbx/business/eocfi_adapter/eocfi_c
5-
cp MakefileLinux.mak Makefile
6-
make
7-
cd ../../../..
8-
# python code
9-
rm -rf lime_tbx.egg-info dist build
10-
python3.9 -m build
11-
rm -rf .venv
12-
python3.9 -m venv .venv
13-
.venv/bin/pip install wheel
14-
.venv/bin/pip install -r requirements.txt
15-
.venv/bin/pip install PySide2~=5.15
16-
pyinstaller lime_tbx.spec
17-
rm -rf deployment/installer/linux/installer_files && rm deployment/installer/linux/lime_installer.zip && rm -rf deployment/installer/debian/lime_*
18-
cd deployment/installer && ./build_linux_installer.sh
19-
cd debian && ./build_deb.sh
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
MODE="pkg"
5+
6+
usage() {
7+
cat <<EOF
8+
Usage: $0 [--c | --pkg | --all]
9+
10+
--c Only compile EO-CFI C code
11+
--pkg Only package Python app (without compiling EO-CFI C code) [default]
12+
--all Compile EO-CFI C code and package Python app
13+
EOF
14+
}
15+
16+
parse_args() {
17+
while [[ $# -gt 0 ]]; do
18+
case "$1" in
19+
--c) MODE="c"; shift ;;
20+
--pkg) MODE="pkg"; shift ;;
21+
--all) MODE="all"; shift ;;
22+
-h|--help) usage; exit 0 ;;
23+
*) echo "Unknown option: $1"; usage; exit 1 ;;
24+
esac
25+
done
26+
}
27+
28+
compile_c() {
29+
echo "[build] Compiling C code (EO-CFI)..."
30+
cd repo/lime_tbx/business/eocfi_adapter/eocfi_c
31+
cp MakefileLinux.mak Makefile
32+
make
33+
cd ../../../../..
34+
}
35+
36+
package_python() {
37+
echo "[build] Packaging Python app..."
38+
cd repo
39+
rm -rf lime_tbx.egg-info dist build
40+
python3.9 -m build
41+
rm -rf .venv
42+
python3.9 -m venv .venv
43+
.venv/bin/pip install wheel
44+
.venv/bin/pip install -r requirements.txt
45+
.venv/bin/pip install "PySide2~=5.15"
46+
pyinstaller lime_tbx.spec
47+
rm -rf deployment/installer/linux/installer_files \
48+
deployment/installer/linux/lime_installer.zip \
49+
deployment/installer/debian/lime_*
50+
cd deployment/installer
51+
./build_linux_installer.sh
52+
cd debian
53+
./build_deb.sh
54+
cd ../../..
55+
}
56+
57+
main() {
58+
parse_args "$@"
59+
60+
case "$MODE" in
61+
c)
62+
compile_c
63+
;;
64+
pkg)
65+
# Skipping C compilation is done to avoid dirty tag version.
66+
echo "WARNING: Skipping C compilation during packaging"
67+
echo "C code is NOT compiled in this package build!"
68+
package_python
69+
;;
70+
all)
71+
compile_c
72+
package_python
73+
;;
74+
esac
75+
}
76+
77+
main "$@"

‎deployment/installer/build_mac_installer.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ cp -r ../../dist/LimeTBX.app mac/bundle/LimeTBX.app
55
cp -r ../../kernels mac/bundle/LimeTBX.app/Contents/Resources/kernels
66
cp -r ../../eocfi_data mac/bundle/LimeTBX.app/Contents/Resources/eocfi_data
77
cp -r ../../coeff_data mac/bundle/LimeTBX.app/Contents/Resources/coeff_data
8-
version='1.2.2'
8+
version='1.3.0'
99
pkgbuild --install-location /Applications --root mac/bundle --identifier 'int.esa.LimeTBX' --scripts mac/scripts --version $version --component-plist mac/Components.plist mac/lime.pkg

‎deployment/installer/debian/build_deb.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22
echo "Building lime .deb package."
3-
# 1.2.2 Comment so the search for the version a.b.c appears (here it is a.b-c)
4-
version="1.2-2"
5-
# 1.2.2 Change it in the control file too!
3+
# 1.3.0 Comment so the search for the version a.b.c appears (here it is a.b-c)
4+
version="1.3-0"
5+
# 1.3.0 Change it in the control file too!
66
name="lime_"$version
77
[ -d $name ] && rm -rf $name
88
[ -f $name".deb" ] && rm -f $name".deb"

0 commit comments

Comments
 (0)