Skip to content

Remove macos-14 #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StephenNneji wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove macos-14 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1782200
Remove macos-14
StephenNneji Nov 5, 2026
66cf0d5
Fix bug in blitting plot and update version
StephenNneji Nov 10, 2026
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
6 changes: 3 additions & 3 deletions .github/workflows/build_wheel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
strategy:
fail-fast: true
matrix:
platform: [windows-latest, ubuntu-latest, macos-15-intel, macos-14]
platform: [windows-latest, ubuntu-latest, macos-15-intel, macos-15]
env:
CIBW_SKIP: 'pp*'
CIBW_ARCHS: 'auto64'
CIBW_MANYLINUX_X86_64_IMAGE: 'manylinux_2_28'
CIBW_PROJECT_REQUIRES_PYTHON: '>=3.10'
CIBW_TEST_REQUIRES: 'pytest'
MACOSX_DEPLOYMENT_TARGET: '14.0'
MACOSX_DEPLOYMENT_TARGET: '15.0'
defaults:
run:
shell: bash -l {0}
Expand All @@ -44,7 +44,7 @@ jobs:
echo "export LDFLAGS=\"$LDFLAGS -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp\"" >> ~/.bashrc
source ~/.bashrc
- name: Install OMP (MacOS M1)
if: matrix.platform == 'macos-14'
if: matrix.platform == 'macos-15'
run: |
brew install llvm@20 libomp
echo "export CC=/opt/homebrew/opt/llvm@20/bin/clang" >> ~/.bashrc
Expand Down
2 changes: 1 addition & 1 deletion cpp/RAT
Open in desktop
Submodule RAT updated 24 files
+3 −3 SLDFunction.cpp
+129 −51 adaptive.cpp
+3 −3 applyBackgroundCorrection.cpp
+2 −2 boundaryHandling.cpp
+40 −0 bsxfun.cpp
+31 −0 bsxfun.h
+1 −1 calcProposal.cpp
+35 −35 combineVectorElements.cpp
+4 −3 combineVectorElements.h
+21 −21 deopt.cpp
+64 −0 diff.cpp
+30 −0 diff.h
+1 −1 eml_mtimes_helper.cpp
+1 −1 eml_mtimes_helper.h
+42 −42 fMinSearch.cpp
+44 −44 find.cpp
+3 −2 find.h
+41 −0 hypot.cpp
+31 −0 hypot.h
+3 −3 metropolisRule.cpp
+36 −36 mrdivide_helper.cpp
+4 −3 mrdivide_helper.h
+3 −3 optimalEllipsoids.cpp
+4 −4 splitEllipsoid.cpp
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build-backend = 'setuptools.build_meta'

[project]
name = "ratapi"
version = "1.0.1.dev0"
version = "1.0.1.dev1"
description = "Python extension for the Reflectivity Analysis Toolbox (RAT)"
readme = "README.md"
requires-python = ">=3.10"
Expand Down
10 changes: 5 additions & 5 deletions ratapi/utils/plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ def plot_ref_sld_helper(
A value between 0 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
animated : bool, default: False
Controls whether the animated property of foreground plot elements should be set.

align_profile : bool, default: False
Controls whether the profiles should be aligned.
"""
preserve_zoom = False

Expand Down Expand Up @@ -588,10 +589,9 @@ def update_foreground(self, data):

offset = 0
for i in range(len(data.contrastNames)):
for _ in range(int(data.dataPresent[i]) + 1):
self.figure.axes[0].lines[offset].set_data(plot_data["ref"][i][0], plot_data["ref"][i][1])
self.figure.axes[0].draw_artist(self.figure.axes[0].lines[offset])
offset += 1
self.figure.axes[0].lines[offset].set_data(plot_data["ref"][i][0], plot_data["ref"][i][1])
self.figure.axes[0].draw_artist(self.figure.axes[0].lines[offset])
offset += 2 if data.dataPresent[i] else 1

i = 0
for j in range(len(plot_data["sld"])):
Expand Down
Loading