Skip to content

Pin Sphinx below 8.2#6344

Merged
stephenworsley merged 2 commits intoSciTools:mainfrom
trexfeathers:pin_sphinx
Feb 28, 2025
Merged

Pin Sphinx below 8.2#6344
stephenworsley merged 2 commits intoSciTools:mainfrom
trexfeathers:pin_sphinx

Conversation

@trexfeathers
Copy link
Contributor

@trexfeathers trexfeathers commented Feb 27, 2025 •
edited
Loading

🚀 Pull Request

Description

Closes #6330

See sphinx-contrib/apidoc#21

#6345: I have raised an issue for us to switch our dependency to the new apidoc that is part of Sphinx core (sphinx.ext.apidoc rather than sphinxcontrib.apidoc), and unpin Sphinx as part of that.

Consult Iris pull request check list

Add any of the below labels to trigger actions on this PR:

  • benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts

@github-actions github-actions bot added the benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts label Feb 27, 2025
@trexfeathers trexfeathers mentioned this pull request Feb 27, 2025
Open
@trexfeathers trexfeathers added benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts and removed benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts labels Feb 27, 2025
@codecov
Copy link

codecov bot commented Feb 27, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.77%. Comparing base (62877bb) to head (fa65f51).
Report is 87 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #6344   +/-   ##
=======================================
  Coverage   89.77%   89.77%           
=======================================
  Files          90       90           
  Lines       23523    23523           
  Branches     4390     4390           
=======================================
  Hits        21118    21118           
  Misses       1662     1662           
  Partials      743      743

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 27, 2025

⏱️ Performance Benchmark Report: 7e3d447

Performance shifts
Full benchmark results 

Benchmarks that have stayed the same:

| Change   | Before [62877bb8]    | After [7e3d4473]    |   Ratio | Benchmark (Parameter)                                                                       |
|----------|----------------------|---------------------|---------|---------------------------------------------------------------------------------------------|
|          | 58.6±0.5ms           | 58.2±0.5ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_COUNT(False)                              |
|          | 59.5±0.6ms           | 59.1±0.5ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_COUNT(True)                               |
|          | 199±2ms              | 199±1ms             |    1    | aggregate_collapse.Aggregation.time_aggregated_by_FAST_PERCENTILE(False)                    |
|          | 199±1ms              | 198±1ms             |    1    | aggregate_collapse.Aggregation.time_aggregated_by_FAST_PERCENTILE(True)                     |
|          | 37.0±0.2ms           | 37.1±0.5ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_GMEAN(False)                              |
|          | 37.7±0.3ms           | 38.1±0.4ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_GMEAN(True)                               |
|          | 36.7±0.2ms           | 37.2±0.3ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_HMEAN(False)                              |
|          | 37.5±0.2ms           | 37.7±0.1ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_HMEAN(True)                               |
|          | 50.9±0.6ms           | 50.5±0.6ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_MAX(False)                                |
|          | 51.0±0.3ms           | 51.1±0.6ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_MAX(True)                                 |
|          | 135±1ms              | 136±1ms             |    1    | aggregate_collapse.Aggregation.time_aggregated_by_MAX_RUN(False)                            |
|          | 137±1ms              | 138±2ms             |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_MAX_RUN(True)                             |
|          | 55.2±0.4ms           | 55.0±0.4ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_MEAN(False)                               |
|          | 56.5±0.9ms           | 55.8±0.3ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_MEAN(True)                                |
|          | 62.6±0.5ms           | 63.1±1ms            |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_MEDIAN(False)                             |
|          | 63.3±0.6ms           | 63.6±0.9ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_MEDIAN(True)                              |
|          | 51.1±0.9ms           | 50.8±0.7ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_MIN(False)                                |
|          | 51.0±0.5ms           | 51.3±0.6ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_MIN(True)                                 |
|          | 1.10±0.02s           | 1.09±0.01s          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_PEAK(False)                               |
|          | 1.10±0s              | 1.09±0.01s          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_PEAK(True)                                |
|          | 507±8ms              | 501±20ms            |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_PERCENTILE(False)                         |
|          | 487±10ms             | 496±10ms            |    1.02 | aggregate_collapse.Aggregation.time_aggregated_by_PERCENTILE(True)                          |
|          | 36.3±0.3ms           | 36.1±0.4ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_PROPORTION(False)                         |
|          | 36.9±0.3ms           | 36.7±0.4ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_PROPORTION(True)                          |
|          | 66.4±0.8ms           | 65.7±0.3ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_RMS(False)                                |
|          | 66.8±0.5ms           | 66.7±0.6ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_RMS(True)                                 |
|          | 68.9±0.8ms           | 69.7±0.5ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_STD_DEV(False)                            |
|          | 71.1±0.8ms           | 70.0±0.6ms          |    0.98 | aggregate_collapse.Aggregation.time_aggregated_by_STD_DEV(True)                             |
|          | 64.7±0.4ms           | 64.8±0.7ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_VARIANCE(False)                           |
|          | 65.2±0.8ms           | 65.2±0.8ms          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_VARIANCE(True)                            |
|          | 24.7±0.6ms           | 24.8±0.3ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_COUNT(False)                               |
|          | 29.2±0.3ms           | 29.0±0.4ms          |    0.99 | aggregate_collapse.Aggregation.time_collapsed_by_COUNT(True)                                |
|          | 131±1ms              | 129±1ms             |    0.99 | aggregate_collapse.Aggregation.time_collapsed_by_FAST_PERCENTILE(False)                     |
|          | 145±0.5ms            | 145±2ms             |    1    | aggregate_collapse.Aggregation.time_collapsed_by_FAST_PERCENTILE(True)                      |
|          | 22.2±0.2ms           | 22.4±0.3ms          |    1.01 | aggregate_collapse.Aggregation.time_collapsed_by_GMEAN(False)                               |
|          | 26.9±0.3ms           | 26.8±0.4ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_GMEAN(True)                                |
|          | 22.1±0.3ms           | 22.3±0.2ms          |    1.01 | aggregate_collapse.Aggregation.time_collapsed_by_HMEAN(False)                               |
|          | 27.0±0.3ms           | 26.8±0.3ms          |    0.99 | aggregate_collapse.Aggregation.time_collapsed_by_HMEAN(True)                                |
|          | 23.1±0.2ms           | 23.4±0.2ms          |    1.01 | aggregate_collapse.Aggregation.time_collapsed_by_MAX(False)                                 |
|          | 27.6±0.2ms           | 28.2±0.5ms          |    1.02 | aggregate_collapse.Aggregation.time_collapsed_by_MAX(True)                                  |
|          | 36.6±0.3ms           | 36.4±0.5ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_MAX_RUN(False)                             |
|          | 40.8±0.4ms           | 40.8±0.4ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_MAX_RUN(True)                              |
|          | 23.6±0.2ms           | 23.8±0.3ms          |    1.01 | aggregate_collapse.Aggregation.time_collapsed_by_MEAN(False)                                |
|          | 28.4±0.2ms           | 28.1±0.2ms          |    0.99 | aggregate_collapse.Aggregation.time_collapsed_by_MEAN(True)                                 |
|          | 26.2±0.2ms           | 26.3±0.3ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_MEDIAN(False)                              |
|          | 30.6±0.4ms           | 30.5±0.2ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_MEDIAN(True)                               |
|          | 23.4±0.3ms           | 23.3±0.2ms          |    0.99 | aggregate_collapse.Aggregation.time_collapsed_by_MIN(False)                                 |
|          | 27.7±0.3ms           | 27.5±0.3ms          |    0.99 | aggregate_collapse.Aggregation.time_collapsed_by_MIN(True)                                  |
|          | 541±2ms              | 541±2ms             |    1    | aggregate_collapse.Aggregation.time_collapsed_by_PEAK(False)                                |
|          | 550±5ms              | 549±4ms             |    1    | aggregate_collapse.Aggregation.time_collapsed_by_PEAK(True)                                 |
|          | 151±1ms              | 151±0.7ms           |    1    | aggregate_collapse.Aggregation.time_collapsed_by_PERCENTILE(False)                          |
|          | 165±0.7ms            | 165±1ms             |    1    | aggregate_collapse.Aggregation.time_collapsed_by_PERCENTILE(True)                           |
|          | 22.2±0.2ms           | 22.1±0.1ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_PROPORTION(False)                          |
|          | 26.8±0.3ms           | 26.8±0.3ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_PROPORTION(True)                           |
|          | 25.7±0.2ms           | 25.7±0.2ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_RMS(False)                                 |
|          | 29.8±0.2ms           | 29.9±0.2ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_RMS(True)                                  |
|          | 25.4±0.3ms           | 25.2±0.2ms          |    0.99 | aggregate_collapse.Aggregation.time_collapsed_by_STD_DEV(False)                             |
|          | 29.4±0.2ms           | 29.4±0.2ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_STD_DEV(True)                              |
|          | 25.0±0.3ms           | 24.6±0.1ms          |    0.98 | aggregate_collapse.Aggregation.time_collapsed_by_VARIANCE(False)                            |
|          | 29.2±0.1ms           | 29.1±0.3ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_VARIANCE(True)                             |
|          | 92.2±1ms             | 92.2±0.6ms          |    1    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_MEAN(False)                     |
|          | 93.1±0.9ms           | 93.0±0.7ms          |    1    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_MEAN(True)                      |
|          | 105±1ms              | 105±1ms             |    0.99 | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_RMS(False)                      |
|          | 105±1ms              | 105±1ms             |    1    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_RMS(True)                       |
|          | 61.3±0.2ms           | 61.0±0.4ms          |    1    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_SUM(False)                      |
|          | 61.9±0.9ms           | 61.8±0.5ms          |    1    | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_SUM(True)                       |
|          | 29.4±0.2ms           | 29.9±0.3ms          |    1.02 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_MEAN(False)                      |
|          | 33.6±0.3ms           | 34.1±0.3ms          |    1.01 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_MEAN(True)                       |
|          | 31.3±0.2ms           | 31.2±0.3ms          |    1    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_RMS(False)                       |
|          | 35.7±0.4ms           | 35.1±0.4ms          |    0.98 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_RMS(True)                        |
|          | 25.4±0.2ms           | 25.2±0.2ms          |    0.99 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_SUM(False)                       |
|          | 29.6±0.2ms           | 29.8±0.2ms          |    1.01 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_SUM(True)                        |
|          | 321±2ms              | 318±3ms             |    0.99 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_WPERCENTILE(False)               |
|          | 334±4ms              | 330±3ms             |    0.99 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_WPERCENTILE(True)                |
|          | 1.10±0.01ms          | 1.09±0.01ms         |    1    | cube.CubeCreation.time_create(False, 'construct')                                           |
|          | 382±3μs              | 377±2μs             |    0.99 | cube.CubeCreation.time_create(False, 'instantiate')                                         |
|          | 920±30μs             | 935±8μs             |    1.02 | cube.CubeCreation.time_create(True, 'construct')                                            |
|          | 553±4μs              | 573±6μs             |    1.04 | cube.CubeCreation.time_create(True, 'instantiate')                                          |
|          | 225±2ms              | 224±1ms             |    1    | cube.CubeEquality.time_equality(False, False, 'all_equal')                                  |
|          | 119±0.6ms            | 119±0.9ms           |    1    | cube.CubeEquality.time_equality(False, False, 'coord_inequality')                           |
|          | 249±2ms              | 249±2ms             |    1    | cube.CubeEquality.time_equality(False, False, 'data_inequality')                            |
|          | 16.7±0.3μs           | 16.8±0.3μs          |    1    | cube.CubeEquality.time_equality(False, False, 'metadata_inequality')                        |
|          | 311±2ms              | 310±2ms             |    1    | cube.CubeEquality.time_equality(False, True, 'all_equal')                                   |
|          | 205±1ms              | 205±2ms             |    1    | cube.CubeEquality.time_equality(False, True, 'coord_inequality')                            |
|          | 338±3ms              | 337±3ms             |    1    | cube.CubeEquality.time_equality(False, True, 'data_inequality')                             |
|          | 16.5±0.2μs           | 16.4±0.1μs          |    1    | cube.CubeEquality.time_equality(False, True, 'metadata_inequality')                         |
|          | 226±1ms              | 224±1ms             |    0.99 | cube.CubeEquality.time_equality(True, False, 'all_equal')                                   |
|          | 118±1ms              | 118±1ms             |    1    | cube.CubeEquality.time_equality(True, False, 'coord_inequality')                            |
|          | 250±2ms              | 252±2ms             |    1.01 | cube.CubeEquality.time_equality(True, False, 'data_inequality')                             |
|          | 51.8±0.7μs           | 50.4±0.3μs          |    0.97 | cube.CubeEquality.time_equality(True, False, 'metadata_inequality')                         |
|          | 313±2ms              | 314±1ms             |    1    | cube.CubeEquality.time_equality(True, True, 'all_equal')                                    |
|          | 205±2ms              | 204±2ms             |    1    | cube.CubeEquality.time_equality(True, True, 'coord_inequality')                             |
|          | 337±2ms              | 338±1ms             |    1    | cube.CubeEquality.time_equality(True, True, 'data_inequality')                              |
|          | 52.6±0.6μs           | 52.5±0.5μs          |    1    | cube.CubeEquality.time_equality(True, True, 'metadata_inequality')                          |
|          | 805±2μs              | 797±5μs             |    0.99 | import_iris.Iris.time__concatenate                                                          |
|          | 185±1μs              | 183±2μs             |    0.99 | import_iris.Iris.time__constraints                                                          |
|          | 115±1μs              | 112±0.7μs           |    0.98 | import_iris.Iris.time__data_manager                                                         |
|          | 91.5±0.6μs           | 89.7±0.3μs          |    0.98 | import_iris.Iris.time__deprecation                                                          |
|          | 163±1μs              | 161±1μs             |    0.98 | import_iris.Iris.time__lazy_data                                                            |
|          | 921±8μs              | 905±5μs             |    0.98 | import_iris.Iris.time__merge                                                                |
|          | 74.3±1μs             | 73.0±0.6μs          |    0.98 | import_iris.Iris.time__representation                                                       |
|          | 601±4μs              | 596±3μs             |    0.99 | import_iris.Iris.time_analysis                                                              |
|          | 141±2μs              | 138±1μs             |    0.98 | import_iris.Iris.time_analysis__area_weighted                                               |
|          | 107±2μs              | 106±2μs             |    0.99 | import_iris.Iris.time_analysis__grid_angles                                                 |
|          | 248±1μs              | 243±1μs             |    0.98 | import_iris.Iris.time_analysis__interpolation                                               |
|          | 191±3μs              | 188±3μs             |    0.98 | import_iris.Iris.time_analysis__regrid                                                      |
|          | 110±0.5μs            | 108±0.3μs           |    0.99 | import_iris.Iris.time_analysis__scipy_interpolate                                           |
|          | 135±0.9μs            | 137±2μs             |    1.01 | import_iris.Iris.time_analysis_calculus                                                     |
|          | 326±2μs              | 328±6μs             |    1.01 | import_iris.Iris.time_analysis_cartography                                                  |
|          | 91.3±0.5μs           | 92.1±1μs            |    1.01 | import_iris.Iris.time_analysis_geomerty                                                     |
|          | 213±2μs              | 212±3μs             |    1    | import_iris.Iris.time_analysis_maths                                                        |
|          | 95.2±1μs             | 94.4±0.8μs          |    0.99 | import_iris.Iris.time_analysis_stats                                                        |
|          | 169±2μs              | 170±4μs             |    1.01 | import_iris.Iris.time_analysis_trajectory                                                   |
|          | 312±2μs              | 307±2μs             |    0.98 | import_iris.Iris.time_aux_factory                                                           |
|          | 81.1±0.5μs           | 79.6±0.4μs          |    0.98 | import_iris.Iris.time_common                                                                |
|          | 160±0.8μs            | 158±2μs             |    0.99 | import_iris.Iris.time_common_lenient                                                        |
|          | 1.37±0.01ms          | 1.36±0.01ms         |    0.99 | import_iris.Iris.time_common_metadata                                                       |
|          | 167±0.9μs            | 165±2μs             |    0.98 | import_iris.Iris.time_common_mixin                                                          |
|          | 1.18±0ms             | 1.17±0ms            |    0.99 | import_iris.Iris.time_common_resolve                                                        |
|          | 200±2μs              | 197±6μs             |    0.98 | import_iris.Iris.time_config                                                                |
|          | 125±3μs              | 124±3μs             |    0.99 | import_iris.Iris.time_coord_categorisation                                                  |
|          | 382±2μs              | 375±4μs             |    0.98 | import_iris.Iris.time_coord_systems                                                         |
|          | 770±4μs              | 755±2μs             |    0.98 | import_iris.Iris.time_coords                                                                |
|          | 649±3μs              | 640±3μs             |    0.99 | import_iris.Iris.time_cube                                                                  |
|          | 233±1μs              | 232±3μs             |    1    | import_iris.Iris.time_exceptions                                                            |
|          | 74.1±2μs             | 73.3±0.7μs          |    0.99 | import_iris.Iris.time_experimental                                                          |
|          | 177±2μs              | 179±1μs             |    1.01 | import_iris.Iris.time_fileformats                                                           |
|          | 254±1μs              | 251±3μs             |    0.99 | import_iris.Iris.time_fileformats__ff                                                       |
|          | 2.52±0.02ms          | 2.51±0.01ms         |    0.99 | import_iris.Iris.time_fileformats__ff_cross_references                                      |
|          | 76.3±1μs             | 74.7±0.7μs          |    0.98 | import_iris.Iris.time_fileformats__pp_lbproc_pairs                                          |
|          | 112±0.9μs            | 112±2μs             |    1    | import_iris.Iris.time_fileformats_abf                                                       |
|          | 421±5μs              | 422±4μs             |    1    | import_iris.Iris.time_fileformats_cf                                                        |
|          | 4.84±0.04ms          | 4.77±0.03ms         |    0.98 | import_iris.Iris.time_fileformats_dot                                                       |
|          | 71.5±0.2μs           | 70.3±2μs            |    0.98 | import_iris.Iris.time_fileformats_name                                                      |
|          | 254±4μs              | 252±2μs             |    0.99 | import_iris.Iris.time_fileformats_name_loaders                                              |
|          | 114±0.7μs            | 113±1μs             |    0.99 | import_iris.Iris.time_fileformats_netcdf                                                    |
|          | 120±0.9μs            | 121±1μs             |    1.01 | import_iris.Iris.time_fileformats_nimrod                                                    |
|          | 208±2μs              | 214±2μs             |    1.03 | import_iris.Iris.time_fileformats_nimrod_load_rules                                         |
|          | 796±2μs              | 791±2μs             |    0.99 | import_iris.Iris.time_fileformats_pp                                                        |
|          | 178±2μs              | 178±2μs             |    1    | import_iris.Iris.time_fileformats_pp_load_rules                                             |
|          | 133±1μs              | 134±3μs             |    1.01 | import_iris.Iris.time_fileformats_pp_save_rules                                             |
|          | 548±1μs              | 538±2μs             |    0.98 | import_iris.Iris.time_fileformats_rules                                                     |
|          | 221±0.7μs            | 217±2μs             |    0.99 | import_iris.Iris.time_fileformats_structured_array_identification                           |
|          | 79.9±0.9μs           | 78.1±0.9μs          |    0.98 | import_iris.Iris.time_fileformats_um                                                        |
|          | 157±0.9μs            | 154±1μs             |    0.98 | import_iris.Iris.time_fileformats_um__fast_load                                             |
|          | 138±0.3μs            | 135±0.6μs           |    0.98 | import_iris.Iris.time_fileformats_um__fast_load_structured_fields                           |
|          | 73.3±0.7μs           | 71.4±0.6μs          |    0.97 | import_iris.Iris.time_fileformats_um__ff_replacement                                        |
|          | 78.8±0.2μs           | 78.9±0.9μs          |    1    | import_iris.Iris.time_fileformats_um__optimal_array_structuring                             |
|          | 957±10μs             | 937±10μs            |    0.98 | import_iris.Iris.time_fileformats_um_cf_map                                                 |
|          | 136±1μs              | 136±2μs             |    1    | import_iris.Iris.time_io                                                                    |
|          | 177±2μs              | 173±0.6μs           |    0.98 | import_iris.Iris.time_io_format_picker                                                      |
|          | 209±1μs              | 205±1μs             |    0.98 | import_iris.Iris.time_iris                                                                  |
|          | 127±2μs              | 125±1μs             |    0.99 | import_iris.Iris.time_iterate                                                               |
|          | 8.16±0.02ms          | 8.13±0.1ms          |    1    | import_iris.Iris.time_palette                                                               |
|          | 1.75±0.02ms          | 1.74±0.01ms         |    0.99 | import_iris.Iris.time_plot                                                                  |
|          | 104±2μs              | 102±0.8μs           |    0.99 | import_iris.Iris.time_quickplot                                                             |
|          | 2.14±0.03ms          | 2.20±0.03ms         |    1.03 | import_iris.Iris.time_std_names                                                             |
|          | 1.84±0.04ms          | 1.83±0.01ms         |    0.99 | import_iris.Iris.time_symbols                                                               |
|          | 275±10ms             | 273±10ms            |    0.99 | import_iris.Iris.time_tests                                                                 |
|          | 251±0.7μs            | 245±0.7μs           |    0.98 | import_iris.Iris.time_third_party_cartopy                                                   |
|          | 4.93±0.03ms          | 4.96±0.02ms         |    1.01 | import_iris.Iris.time_third_party_cf_units                                                  |
|          | 117±0.8μs            | 114±0.4μs           |    0.98 | import_iris.Iris.time_third_party_cftime                                                    |
|          | 2.70±0.01ms          | 2.69±0.01ms         |    1    | import_iris.Iris.time_third_party_matplotlib                                                |
|          | 1.31±0.01ms          | 1.28±0.01ms         |    0.98 | import_iris.Iris.time_third_party_numpy                                                     |
|          | 168±2μs              | 164±0.4μs           |    0.98 | import_iris.Iris.time_third_party_scipy                                                     |
|          | 98.3±0.6μs           | 97.5±0.9μs          |    0.99 | import_iris.Iris.time_time                                                                  |
|          | 340±5μs              | 338±5μs             |    0.99 | import_iris.Iris.time_util                                                                  |
|          | 70.3±0.7μs           | 69.0±0.6μs          |    0.98 | iterate.IZip.time_izip                                                                      |
|          | 10.1±0.08ms          | 10.0±0.1ms          |    0.99 | load.LoadAndRealise.time_load((1280, 960, 5), False, 'FF')                                  |
|          | 15.1±0.4ms           | 15.4±0.4ms          |    1.02 | load.LoadAndRealise.time_load((1280, 960, 5), False, 'NetCDF')                              |
|          | 10.2±0.04ms          | 10.2±0.03ms         |    1    | load.LoadAndRealise.time_load((1280, 960, 5), False, 'PP')                                  |
|          | 10.1±0.03ms          | 10.2±0.1ms          |    1.01 | load.LoadAndRealise.time_load((1280, 960, 5), True, 'FF')                                   |
|          | 12.6±0.2ms           | 12.8±0.3ms          |    1.01 | load.LoadAndRealise.time_load((1280, 960, 5), True, 'NetCDF')                               |
|          | 10.2±0.02ms          | 10.3±0.07ms         |    1.01 | load.LoadAndRealise.time_load((1280, 960, 5), True, 'PP')                                   |
|          | 1.59±0.01s           | 1.59±0.01s          |    1    | load.LoadAndRealise.time_load((2, 2, 1000), False, 'FF')                                    |
|          | 11.5±0.04ms          | 11.7±0.2ms          |    1.02 | load.LoadAndRealise.time_load((2, 2, 1000), False, 'NetCDF')                                |
|          | 1.59±0.01s           | 1.61±0.01s          |    1.01 | load.LoadAndRealise.time_load((2, 2, 1000), False, 'PP')                                    |
|          | 1.58±0.01s           | 1.58±0.02s          |    1    | load.LoadAndRealise.time_load((2, 2, 1000), True, 'FF')                                     |
|          | 11.6±0.06ms          | 11.5±0.3ms          |    0.99 | load.LoadAndRealise.time_load((2, 2, 1000), True, 'NetCDF')                                 |
|          | 1.59±0.02s           | 1.61±0.02s          |    1.01 | load.LoadAndRealise.time_load((2, 2, 1000), True, 'PP')                                     |
|          | 5.22±0.04ms          | 5.21±0.07ms         |    1    | load.LoadAndRealise.time_load((50, 50, 2), False, 'FF')                                     |
|          | 11.4±0.05ms          | 11.3±0.1ms          |    0.99 | load.LoadAndRealise.time_load((50, 50, 2), False, 'NetCDF')                                 |
|          | 5.23±0.01ms          | 5.28±0.06ms         |    1.01 | load.LoadAndRealise.time_load((50, 50, 2), False, 'PP')                                     |
|          | 5.23±0.04ms          | 5.20±0.04ms         |    0.99 | load.LoadAndRealise.time_load((50, 50, 2), True, 'FF')                                      |
|          | 11.4±0.1ms           | 11.4±0.05ms         |    1    | load.LoadAndRealise.time_load((50, 50, 2), True, 'NetCDF')                                  |
|          | 5.24±0.03ms          | 5.23±0.05ms         |    1    | load.LoadAndRealise.time_load((50, 50, 2), True, 'PP')                                      |
|          | 21.6±1ms             | 21.3±0.3ms          |    0.99 | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'FF')                               |
|          | 18.7±0.1ms           | 18.8±0.1ms          |    1    | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'NetCDF')                           |
|          | 10.9±0.9ms           | 11.0±0.6ms          |    1.01 | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'PP')                               |
|          | 26.7±0.6ms           | 27.1±0.4ms          |    1.02 | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'FF')                                |
|          | 67.9±0.8ms           | 67.8±0.6ms          |    1    | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'NetCDF')                            |
|          | 26.7±0.6ms           | 26.4±0.5ms          |    0.99 | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'PP')                                |
|          | 545±2ms              | 541±3ms             |    0.99 | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'FF')                                 |
|          | 2.69±0.08ms          | 2.66±0.1ms          |    0.99 | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'NetCDF')                             |
|          | 545±2ms              | 542±2ms             |    0.99 | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'PP')                                 |
|          | 559±3ms              | 553±2ms             |    0.99 | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'FF')                                  |
|          | 2.76±0.06ms          | 2.65±0.08ms         |    0.96 | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'NetCDF')                              |
|          | 554±4ms              | 553±4ms             |    1    | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'PP')                                  |
|          | 1.71±0.05ms          | 1.61±0.02ms         |    0.95 | load.LoadAndRealise.time_realise((50, 50, 2), False, 'FF')                                  |
|          | 2.67±0.1ms           | 2.67±0.09ms         |    1    | load.LoadAndRealise.time_realise((50, 50, 2), False, 'NetCDF')                              |
|          | 1.65±0.05ms          | 1.65±0.04ms         |    1    | load.LoadAndRealise.time_realise((50, 50, 2), False, 'PP')                                  |
|          | 1.70±0.06ms          | 1.62±0.06ms         |    0.95 | load.LoadAndRealise.time_realise((50, 50, 2), True, 'FF')                                   |
|          | 2.77±0.1ms           | 2.69±0.06ms         |    0.97 | load.LoadAndRealise.time_realise((50, 50, 2), True, 'NetCDF')                               |
|          | 1.64±0.04ms          | 1.64±0.04ms         |    1    | load.LoadAndRealise.time_realise((50, 50, 2), True, 'PP')                                   |
|          | 345±2ms              | 344±3ms             |    1    | load.ManyCubes.time_many_cube_load                                                          |
|          | 83.3±0.6ms           | 83.4±1ms            |    1    | load.ManyVars.time_many_var_load                                                            |
|          | 10.3±0.03ms          | 10.3±0.2ms          |    1    | load.STASHConstraint.time_stash_constraint((1280, 960, 5), 'FF')                            |
|          | 10.3±0.08ms          | 10.3±0.1ms          |    0.99 | load.STASHConstraint.time_stash_constraint((1280, 960, 5), 'PP')                            |
|          | 1.59±0.01s           | 1.61±0.01s          |    1.01 | load.STASHConstraint.time_stash_constraint((2, 2, 1000), 'FF')                              |
|          | 1.61±0s              | 1.60±0.02s          |    1    | load.STASHConstraint.time_stash_constraint((2, 2, 1000), 'PP')                              |
|          | 5.29±0.04ms          | 5.29±0.07ms         |    1    | load.STASHConstraint.time_stash_constraint((2, 2, 2), 'FF')                                 |
|          | 5.28±0.01ms          | 5.29±0.06ms         |    1    | load.STASHConstraint.time_stash_constraint((2, 2, 2), 'PP')                                 |
|          | 9.32±0.03ms          | 9.40±0.03ms         |    1.01 | load.StructuredFF.time_structured_load((1280, 960, 5), False)                               |
|          | 6.14±0.04ms          | 6.18±0.02ms         |    1.01 | load.StructuredFF.time_structured_load((1280, 960, 5), True)                                |
|          | 1.58±0.01s           | 1.58±0.01s          |    1    | load.StructuredFF.time_structured_load((2, 2, 1000), False)                                 |
|          | 582±7ms              | 576±7ms             |    0.99 | load.StructuredFF.time_structured_load((2, 2, 1000), True)                                  |
|          | 4.44±0.04ms          | 4.43±0.1ms          |    1    | load.StructuredFF.time_structured_load((2, 2, 2), False)                                    |
|          | 4.31±0.02ms          | 4.31±0.04ms         |    1    | load.StructuredFF.time_structured_load((2, 2, 2), True)                                     |
|          | 174±0.8ms            | 171±1ms             |    0.98 | load.TimeConstraint.time_time_constraint(20, 'FF')                                          |
|          | 14.4±0.05ms          | 14.4±0.04ms         |    1    | load.TimeConstraint.time_time_constraint(20, 'NetCDF')                                      |
|          | 176±2ms              | 173±0.9ms           |    0.98 | load.TimeConstraint.time_time_constraint(20, 'PP')                                          |
|          | 33.8±0.3ms           | 33.5±0.2ms          |    0.99 | load.TimeConstraint.time_time_constraint(3, 'FF')                                           |
|          | 14.2±0.02ms          | 14.1±0.2ms          |    0.99 | load.TimeConstraint.time_time_constraint(3, 'NetCDF')                                       |
|          | 34.0±0.6ms           | 33.6±0.3ms          |    0.99 | load.TimeConstraint.time_time_constraint(3, 'PP')                                           |
|          | 13.7±0.09ms          | 13.4±0.4ms          |    0.97 | load.ugrid.BasicLoading.time_load_file(1)                                                   |
|          | 47.7±0.4ms           | 47.9±0.8ms          |    1    | load.ugrid.BasicLoading.time_load_file(200000)                                              |
|          | 8.76±0.2ms           | 8.67±0.2ms          |    0.99 | load.ugrid.BasicLoading.time_load_mesh(1)                                                   |
|          | 15.8±0.4ms           | 15.6±0.2ms          |    0.99 | load.ugrid.BasicLoading.time_load_mesh(200000)                                              |
|          | 13.6±0.5ms           | 13.4±0.2ms          |    0.98 | load.ugrid.BasicLoadingTime.time_load_file(1)                                               |
|          | 14.9±0.1ms           | 15.0±0.4ms          |    1.01 | load.ugrid.BasicLoadingTime.time_load_file(200000)                                          |
|          | 8.75±0.2ms           | 8.52±0.2ms          |    0.97 | load.ugrid.BasicLoadingTime.time_load_mesh(1)                                               |
|          | 11.4±0.3ms           | 11.3±0.2ms          |    0.99 | load.ugrid.BasicLoadingTime.time_load_mesh(200000)                                          |
|          | 14.5±0.3ms           | 14.4±0.3ms          |    0.99 | load.ugrid.Callback.time_load_file_callback(1)                                              |
|          | 58.7±0.6ms           | 57.6±0.6ms          |    0.98 | load.ugrid.Callback.time_load_file_callback(200000)                                         |
|          | 14.3±0.3ms           | 14.1±0.1ms          |    0.99 | load.ugrid.CallbackTime.time_load_file_callback(1)                                          |
|          | 16.7±0.2ms           | 16.5±0.1ms          |    0.99 | load.ugrid.CallbackTime.time_load_file_callback(200000)                                     |
|          | 2.54±0.09ms          | 2.56±0.05ms         |    1.01 | load.ugrid.DataRealisation.time_realise_data(10000)                                         |
|          | 3.56±0.09ms          | 3.60±0.1ms          |    1.01 | load.ugrid.DataRealisation.time_realise_data(200000)                                        |
|          | 34.3±1ms             | 36.0±1ms            |    1.05 | load.ugrid.DataRealisationTime.time_realise_data(10000)                                     |
|          | 772±6ms              | 781±3ms             |    1.01 | load.ugrid.DataRealisationTime.time_realise_data(200000)                                    |
|          | 444±3ms              | 440±3ms             |    0.99 | merge_concat.Concatenate.time_concatenate(False)                                            |
|          | 444±4ms              | 442±3ms             |    1    | merge_concat.Concatenate.time_concatenate(True)                                             |
|          | 109±0.3M             | 109±0.3M            |    1    | merge_concat.Concatenate.tracemalloc_concatenate(False)                                     |
|          | 109±0.3M             | 109±0.3M            |    1    | merge_concat.Concatenate.tracemalloc_concatenate(True)                                      |
|          | 50.0±0.5ms           | 49.9±0.4ms          |    1    | merge_concat.Merge.time_merge                                                               |
|          | 2.49±1M              | 2.49±1M             |    1    | merge_concat.Merge.tracemalloc_merge                                                        |
|          | 332±2ns              | 332±2ns             |    1    | mesh.utils.regions_combine.CombineRegionsComputeRealData.time_compute_data(50)              |
|          | 194±1ms              | 194±1ms             |    1    | mesh.utils.regions_combine.CombineRegionsComputeRealData.time_compute_data(500)             |
|          | 651±1k               | 651±1k              |    1    | mesh.utils.regions_combine.CombineRegionsComputeRealData.tracemalloc_compute_data(50)       |
|          | 60.1±0M              | 60.1±0M             |    1    | mesh.utils.regions_combine.CombineRegionsComputeRealData.tracemalloc_compute_data(500)      |
|          | 17.9±0.2ms           | 17.6±0.2ms          |    0.98 | mesh.utils.regions_combine.CombineRegionsCreateCube.time_create_combined_cube(50)           |
|          | 20.3±0.2ms           | 20.0±0.4ms          |    0.98 | mesh.utils.regions_combine.CombineRegionsCreateCube.time_create_combined_cube(500)          |
|          | 1.14±0M              | 1.13±0M             |    1    | mesh.utils.regions_combine.CombineRegionsCreateCube.tracemalloc_create_combined_cube(50)    |
|          | 13±0M                | 13±0M               |    1    | mesh.utils.regions_combine.CombineRegionsCreateCube.tracemalloc_create_combined_cube(500)   |
|          | 105±1ms              | 104±0.2ms           |    0.99 | mesh.utils.regions_combine.CombineRegionsFileStreamedCalc.time_stream_file2file(50)         |
|          | 570±5ms              | 574±3ms             |    1.01 | mesh.utils.regions_combine.CombineRegionsFileStreamedCalc.time_stream_file2file(500)        |
|          | 1.31±0.04M           | 1.28±0.03M          |    0.98 | mesh.utils.regions_combine.CombineRegionsFileStreamedCalc.tracemalloc_stream_file2file(50)  |
|          | 96.3±0.02M           | 96.3±0.02M          |    1    | mesh.utils.regions_combine.CombineRegionsFileStreamedCalc.tracemalloc_stream_file2file(500) |
|          | 66.2±0.7ms           | 66.5±1ms            |    1    | mesh.utils.regions_combine.CombineRegionsSaveData.time_save(50)                             |
|          | 527±3ms              | 528±4ms             |    1    | mesh.utils.regions_combine.CombineRegionsSaveData.time_save(500)                            |
|          | 1.2±0.02M            | 1.17±0.01M          |    0.98 | mesh.utils.regions_combine.CombineRegionsSaveData.tracemalloc_save(50)                      |
|          | 96.2±0.02M           | 96.2±0.01M          |    1    | mesh.utils.regions_combine.CombineRegionsSaveData.tracemalloc_save(500)                     |
|          | 2.1752849999999997   | 2.1752849999999997  |    1    | mesh.utils.regions_combine.CombineRegionsSaveData.track_filesize_saved(50)                  |
|          | 216.01528499999998   | 216.01528499999998  |    1    | mesh.utils.regions_combine.CombineRegionsSaveData.track_filesize_saved(500)                 |
|          | 6.74±0.04ms          | 6.71±0.04ms         |    1    | plot.AuxSort.time_aux_sort                                                                  |
|          | 78.5±2ms             | 79.3±4ms            |    1.01 | regridding.CurvilinearRegridding.time_regrid_pic                                            |
|          | 136±3M               | 136±3M              |    1    | regridding.CurvilinearRegridding.tracemalloc_regrid_pic                                     |
|          | 99.7±0.9ms           | 99.9±0.9ms          |    1    | regridding.HorizontalChunkedRegridding.time_regrid_area_w                                   |
|          | 48.1±0.4ms           | 48.3±0.3ms          |    1    | regridding.HorizontalChunkedRegridding.time_regrid_area_w_new_grid                          |
|          | 106±0.06M            | 106±0.06M           |    1    | regridding.HorizontalChunkedRegridding.tracemalloc_regrid_area_w                            |
|          | 147±0.02M            | 147±0.02M           |    1    | regridding.HorizontalChunkedRegridding.tracemalloc_regrid_area_w_new_grid                   |
|          | 4.38±0.07ms          | 4.27±0.04ms         |    0.98 | save.NetcdfSave.time_netcdf_save_cube(50, False)                                            |
|          | 72.6±0.8ms           | 72.5±0.4ms          |    1    | save.NetcdfSave.time_netcdf_save_cube(50, True)                                             |
|          | 43.0±0.8ms           | 43.4±0.5ms          |    1.01 | save.NetcdfSave.time_netcdf_save_cube(600, False)                                           |
|          | 479±3ms              | 478±2ms             |    1    | save.NetcdfSave.time_netcdf_save_cube(600, True)                                            |
|          | 84.4±0.6ns           | 84.3±0.6ns          |    1    | save.NetcdfSave.time_netcdf_save_mesh(50, False)                                            |
|          | 54.4±0.3ms           | 54.3±0.6ms          |    1    | save.NetcdfSave.time_netcdf_save_mesh(50, True)                                             |
|          | 85.7±0.4ns           | 85.3±1ns            |    1    | save.NetcdfSave.time_netcdf_save_mesh(600, False)                                           |
|          | 421±2ms              | 423±3ms             |    1    | save.NetcdfSave.time_netcdf_save_mesh(600, True)                                            |
|          | 30.6±0.2k            | 30.6±0.1k           |    1    | save.NetcdfSave.tracemalloc_netcdf_save(50, False)                                          |
|          | 1.71±0.1M            | 1.76±0.07M          |    1.03 | save.NetcdfSave.tracemalloc_netcdf_save(50, True)                                           |
|          | 30.6±0.1k            | 30.6±0.1k           |    1    | save.NetcdfSave.tracemalloc_netcdf_save(600, False)                                         |
|          | 190±10M              | 225±30M             |    1.18 | save.NetcdfSave.tracemalloc_netcdf_save(600, True)                                          |
|          | 41.5±0.6ms           | 41.7±0.5ms          |    1.01 | stats.PearsonR.time_lazy                                                                    |
|          | 8.88±0.2ms           | 9.05±0.1ms          |    1.02 | stats.PearsonR.time_real                                                                    |
|          | 24.7±1M              | 24.3±2M             |    0.98 | stats.PearsonR.tracemalloc_lazy                                                             |
|          | 18.4±0.01M           | 18.4±0.01M          |    1    | stats.PearsonR.tracemalloc_real                                                             |
|          | 20.0±0.09ms          | 20.7±0.4ms          |    1.03 | trajectory.TrajectoryInterpolation.time_trajectory_linear                                   |
|          | 66.1±0.2ms           | 66.0±0.3ms          |    1    | trajectory.TrajectoryInterpolation.time_trajectory_nearest                                  |
|          | 17.6±0.02M           | 17.6±0.02M          |    1    | trajectory.TrajectoryInterpolation.tracemalloc_trajectory_linear                            |
|          | 12.1±0.01M           | 12.1±0.01M          |    1    | trajectory.TrajectoryInterpolation.tracemalloc_trajectory_nearest                           |

Generated by GHA run 13572125921

stephenworsley
stephenworsley approved these changes Feb 28, 2025
View reviewed changes
Copy link
Contributor

@stephenworsley stephenworsley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@stephenworsley stephenworsley merged commit 010389c into SciTools:main Feb 28, 2025
22 of 23 checks passed
ukmo-ccbunney added a commit to ukmo-ccbunney/iris that referenced this pull request Feb 28, 2025
@ukmo-ccbunney
Merge remote-tracking branch 'upstream/main' into varlen_str_type
1c34e42 
* upstream/main:
  Faster dimension lookup for derived coordinates (SciTools#6337)
  Unpin dask 2 (SciTools#6342)
  added classification enums to qp (SciTools#6346)
  Add castable check for valid_range, valid_min, valid_max. (SciTools#6343)
  Pin Sphinx below 8.2 (SciTools#6344)
  Add a text feature to quickplot (SciTools#6333)
@scitools-ci scitools-ci bot removed this from 🚴 Peloton Mar 29, 2025
@trexfeathers trexfeathers deleted the pin_sphinx branch August 22, 2025 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stephenworsley stephenworsley stephenworsley approved these changes

Assignees

No one assigned

Labels

benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts Type: Documentation Type: Infrastructure

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@trexfeathers @stephenworsley