Feat/fair2 ciceroscmpy2 adapters and runmode nonfork - #97

Open

maritsandstad wants to merge 85 commits into

mainfrom

feat/fair2-ciceroscmpy2-adapters-and-runmode-nonfork

Commits on Jun 1, 2026

Phase C: PR B dry-run assembly off openscm/openscm-runner@main
benmsanderson
committed
ec54a38
Phase D: bump scmdata>=0.19; drop fork-only README notes
benmsanderson
committed
18e5ca0

Commits on Jun 2, 2026

Scenarios-driven CICEROSCMPY2 + FaIR2 CD; FaIR-mirror surface

benmsanderson
and
claude
committed
3afa7cc
FaIR 1.x adapter: handle pandas 3.0 None -> NaN context inference

benmsanderson
and
claude
committed
1dd41d3
docs: Sphinx + notebook coverage for the new adapters

benmsanderson
and
claude
committed
5f37461
CICEROSCMPY2: resolve Marit's Zenodo posterior; cite DOI in README + notebook

benmsanderson
and
claude
committed
ea6984c
Bump Python floor to 3.10 (scmdata>=0.19 drops 3.9 support)

benmsanderson
and
claude
committed
bab7005
readthedocs: defensive pip install of sphinx-autodocgen

benmsanderson
and
claude
committed
aae0c36
readthedocs: also pip install -e . to get openscm_runner on path

benmsanderson
and
claude
committed
278df29
readthedocs: drop poetry; pip install docs group directly

benmsanderson
and
claude
committed
1359c2b
readthedocs: add seaborn for notebook execution

benmsanderson
and
claude
committed
cb3b422
notebooks: use lineplot-native kwargs

benmsanderson
and
claude
committed
387465c
docs: disable notebook execution at build time

benmsanderson
and
claude
committed
1346890
ci: install poetry-plugin-export for the licences check

benmsanderson
and
claude
committed
b89727f
tests: skip modern-adapter unit tests when fair2 / ciceroscm2 absent

benmsanderson
and
claude
committed
7e3f4a1
Merge pull request #98 from benmsanderson/feat/fair2-ciceroscmpy2-adapters-and-runmode
maritsandstad
authored
d38c62d
CICEROSCMPY2 _compat: HAS_CICEROSCM_PY2 also gates on major version

benmsanderson
and
claude
committed
d8cecdd
Merge branch 'feat/fair2-ciceroscmpy2-adapters-and-runmode' into feat/fair2-ciceroscmpy2-adapters-and-runmode-nonfork
maritsandstad
committed
438211b
Revert HAS_CICEROSCM_PY2 change; dual-check in skipif markers instead

benmsanderson
and
claude
committed
a3871b7
ci: fix three pre-existing infra blockers in the tests matrix

benmsanderson
and
claude
committed
fc2642e
Attempted matrix environment for testing
maritsandstad
committed
00d640f
Merge branch 'feat/fair2-ciceroscmpy2-adapters-and-runmode' into feat/fair2-ciceroscmpy2-adapters-and-runmode-nonfork
maritsandstad
committed
cec4043
Merge from branch on non-fork
maritsandstad
committed
9793e5d
ci: lower coverage threshold to 40 (CI measured 43.65%)

benmsanderson
and
claude
committed
83720ee

Commits on Jun 3, 2026

Merge branch 'feat/fair2-ciceroscmpy2-adapters-and-runmode' into feat/fair2-ciceroscmpy2-adapters-and-runmode-nonfork
maritsandstad
committed
de9e558
Merge branch 'feat/fair2-ciceroscmpy2-adapters-and-runmode-nonfork' into test-dual-environment
maritsandstad
committed
bf1ca73
better environment naming, ci-fix
maritsandstad
committed
d5e3119
More attempts at ci fixing
maritsandstad
committed
f7a3812
review/pr97: address Zeb's code-quality comments

benmsanderson
and
claude
committed
9ad17c3
More fixes for multi-matrix tests
maritsandstad
committed
1095620
Another attempt to try to get the combined coverage report to work in the CI
maritsandstad
committed
541bdf5
One more try to combine the coverage
maritsandstad
committed
35ee15d
One more go at finetuning cis
maritsandstad
committed
1c20d17
And again
maritsandstad
committed
e410cfc
And again
maritsandstad
committed
a86d9e0
review/pr97: rename CICERO_TO_FAIR2_SPECIES -> RCMIP_TO_FAIR2_SPECIES

benmsanderson
and
claude
committed
7e2cc7b
One more try
maritsandstad
committed
b1c1a32
Trying again to combine the coverage
maritsandstad
committed
1b9fc08
Trying again to combine the coverage
maritsandstad
committed
5f18964
More combo wrangling
maritsandstad
committed
9ec0568
Mteenth attempt
maritsandstad
committed
03d5a7d
Another go
maritsandstad
committed
43b0a16
again
maritsandstad
committed
055b284
review/pr97: add openscm_runner.io.rcmip3 reader for Zenodo 20430630

benmsanderson
and
claude
committed
5f57a23
again
maritsandstad
committed
5b74d1f
Another attempt
maritsandstad
committed
0b14592
Another attempt
maritsandstad
committed
5d6f972
Trying again
maritsandstad
committed
3978f68
Merge pull request #100 from openscm/test-dual-environment-no-fork
maritsandstad
authored
2bba5e4
Merging in from the branch we are merging to
maritsandstad
committed
0d9f5b1
Moving io tests to avoid namespace overwriting
maritsandstad
committed
207f43d

Commits on Jun 4, 2026

Remove kwargs and superfluous super calls +
maritsandstad
committed
68f0d5a
review/pr97: wire FaIR2 + CICEROSCMPY2 to canonical RCMIP3 land-use forcings

benmsanderson
and
claude
committed
c047e1c
review/pr97: mark test_modern_adapters.py for env2 of multi-env CI matrix

benmsanderson
and
claude
committed
fe2bd70
review/pr97: route FaIR2 Solar+Volcanic through canonical RCMIP3 forcings

benmsanderson
and
claude
committed
c5787b0
review/pr97: route CICEROSCMPY2 Solar+Volcanic through RCMIP3 canonical + fix rf_sun_file key

benmsanderson
and
claude
committed
ed94023
review/pr97: back-report Solar/Volcanic/Land use ERF in CICEROSCMPY2 on RCMIP3 path

benmsanderson
and
claude
committed
bb39feb
review/pr97: wire FaIR2 + CICEROSCMPY2 emissions+concentrations to canonical RCMIP3

benmsanderson
and
claude
committed
6affa5c
review/pr97: fix CI failures from the first run of PR #102

benmsanderson
and
claude
committed
806d745
review/pr97: invert run.py validation order back, fix the affected tests instead

benmsanderson
and
claude
committed
31810b4

Commits on Jun 5, 2026

Commits on Jun 8, 2026

Commits on Jun 22, 2026

fix(fair2): guard _splice_bundle_with_user against empty bundle

benmsanderson
and
claude
committed
6e7041e
fix(fair2): hold non-CO2 at PI baseline for idealised conc runs

benmsanderson
and
claude
committed
7e5f734
docs: idealised conc-driven experiments + non-conc-species baseline

benmsanderson
and
claude
committed
62f922b
test(fair2): idealised conc-driven non-CO2 ERF is ~0 at PI

benmsanderson
and
claude
committed
fad15de
docs(changelog): add fragments for #105

benmsanderson
and
claude
committed
eda57b4
Merge pull request #106 from openscm/fix/fair2-idealised-pi-erf
benmsanderson
authored
dbbcb55

Commits on Jun 25, 2026

fix(ciceroscmpy2): hold aerosols at PI for idealised conc-driven runs

benmsanderson
and
claude
committed
cb6be3e
docs(changelog): add fragment for #108

benmsanderson
and
claude
committed
66e1279
Merge pull request #108 from benmsanderson/fix/cicero-idealised-conc-aerosol-overlay
benmsanderson
authored
fd4cd4d

Commits on Jul 2, 2026

perf(fair2): vectorise forcing-aggregation output extraction

benmsanderson
and
claude
committed
291f211
docs(changelog): add fragment for #109

benmsanderson
and
claude
committed
2f3abcb
Merge pull request #109 from openscm/perf/fair2-vectorise-output-extraction
benmsanderson
authored
bdeb4e7