Pytest merge conflicts #6209
Merged
Pytest merge conflicts #6209
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix numpy (ruff NPY002) * handle test with dask array.
* add numpdoc_validate to pre-commit * wip * wip * wip * fixed doctest errors. * fox doctests. * Update docs/src/further_topics/filtering_warnings.rst Co-authored-by: Martin Yeo <[email protected]> * numpydoc_validation to adhere to RT02 rule. * sorted temp rules to ignore. * numpydoc_validation to adhere to GL09 rule. * numpydoc_validation to adhere to SA04 rule. * fixed indent. * fixed case and indentation. * fix doctests. * fix doctests (last time) * add "See Also" colons --------- Co-authored-by: Martin Yeo <[email protected]>
…5776) * Trigger benchmarks if lock files have changed. * Check for 'true' string not boolean * Temporarily disable other CI. * Limit branch actions to pull requests * Unified continue check. * Benchmarks temporary debug mode. * Demonstrate lock file trigger for benchmarks. * Demonstrate overnight mode. * Revert "Demonstrate overnight mode." This reverts commit fbb4ab7. * Revert "Demonstrate lock file trigger for benchmarks." This reverts commit 5522251. * Minor visual improvements. * Explanatory notes. * Revert "Benchmarks temporary debug mode." This reverts commit 8f097b1. * Revert "Temporarily disable other CI." This reverts commit 621a774. * Fix docs indentation. * Custom ASV build command using setup.py. * Remove ASV pin. * Don't trigger benchmarks when pyproject.toml changes. * More accurate name for files-changed step. * Don't have a continue output. * Remove confusing variable name clash. * Update What's New entry.
* add whatsnews for recent PRs * Update docs/src/whatsnew/latest.rst Co-authored-by: Bill Little <[email protected]> --------- Co-authored-by: Bill Little <[email protected]>
Bumps [scitools/workflows](https://github.com/scitools/workflows) from 2024.02.1 to 2024.02.2. - [Release notes](https://github.com/scitools/workflows/releases) - [Commits](SciTools/workflows@2024.02.1...2024.02.2) --- updated-dependencies: - dependency-name: scitools/workflows dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Lazy rolling_window * Add test and whatsnew entry
Trial 3v8 mergeback
* fix usage of map_blocks * fix map_blocks for non-lazy data * add benchmark * unskip benchmark * add benchmark * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * remove benchmarks * remove unnecessary import * What's New entry. * map_complete_blocks docstring. * map_complete_blocks returns. * Typo. * Typo. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Martin Yeo <[email protected]>
Bumps [scitools/workflows](https://github.com/scitools/workflows) from 2024.02.2 to 2024.03.0. - [Release notes](https://github.com/scitools/workflows/releases) - [Commits](SciTools/workflows@2024.02.2...2024.03.0) --- updated-dependencies: - dependency-name: scitools/workflows dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…ons/scitools/workflows-2024.03.0 Bump scitools/workflows from 2024.02.2 to 2024.03.0
Bumps [scitools/workflows](https://github.com/scitools/workflows) from 2024.03.0 to 2024.03.1. - [Release notes](https://github.com/scitools/workflows/releases) - [Commits](SciTools/workflows@2024.03.0...2024.03.1) --- updated-dependencies: - dependency-name: scitools/workflows dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…ons/scitools/workflows-2024.03.1 Bump scitools/workflows from 2024.03.0 to 2024.03.1
Bumps [scitools/workflows](https://github.com/scitools/workflows) from 2024.03.1 to 2024.03.3. - [Release notes](https://github.com/scitools/workflows/releases) - [Commits](SciTools/workflows@2024.03.1...2024.03.3) --- updated-dependencies: - dependency-name: scitools/workflows dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…ons/scitools/workflows-2024.03.3 Bump scitools/workflows from 2024.03.1 to 2024.03.3
updates: - [github.com/astral-sh/ruff-pre-commit: v0.2.1 → v0.3.3](astral-sh/ruff-pre-commit@v0.2.1...v0.3.3)
for more information, see https://pre-commit.ci
…onfig [pre-commit.ci] pre-commit autoupdate
`v3.7.1` merge-back
`v3.8.1` merge-back
updates: - [github.com/astral-sh/ruff-pre-commit: v0.3.3 → v0.3.4](astral-sh/ruff-pre-commit@v0.3.3...v0.3.4) - [github.com/numpy/numpydoc: v1.6.0 → v1.7.0rc0](numpy/numpydoc@v1.6.0...v1.7.0rc0)
* Added `colorbar` keyword to relevant quickplot plotting routines to user to control automatic generation of a colorbar. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Set defaults for colorbar keyword * Added new test case for pcolormesh, pcolor and contourf * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Added "Whats New" entry + added my GitHub unsername to common_links.inc * Updated IRIS_TEST_DATA_VERSION in CI * Added reminder comment in ci-tests.yml --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Bumps [scitools/workflows](https://github.com/scitools/workflows) from 2024.10.0 to 2024.10.1. - [Release notes](https://github.com/scitools/workflows/releases) - [Commits](SciTools/workflows@2024.10.0...2024.10.1) --- updated-dependencies: - dependency-name: scitools/workflows dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Provided error message for malformed `cell_method` attribute * Made `cell_method` pattern matching more lenient w.r.t. space after colon separator * Changed `cell_methods` regex slightly to fix failures in unit tests. Also added new unit test to check cell_methods with: 1. Name only (no colon and method) 2. Not space between colon separator and method. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Added WhatsNew entry * Update docs/src/whatsnew/latest.rst Co-authored-by: Elias <[email protected]> --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Martin Yeo <[email protected]> Co-authored-by: Elias <[email protected]>
Co-authored-by: Lockfile bot <[email protected]>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.9 → v0.7.0](astral-sh/ruff-pre-commit@v0.6.9...v0.7.0) - [github.com/asottile/blacken-docs: 1.18.0 → 1.19.0](adamchainz/blacken-docs@1.18.0...1.19.0) - [github.com/pre-commit/mirrors-mypy: v1.11.2 → v1.12.1](pre-commit/mirrors-mypy@v1.11.2...v1.12.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lockfile bot <[email protected]>
* first draft * address review comments * Update docs/src/further_topics/controlling_merge.rst Co-authored-by: Patrick Peglar <[email protected]> * change title --------- Co-authored-by: Patrick Peglar <[email protected]>
Bumps [scitools/workflows](https://github.com/scitools/workflows) from 2024.10.1 to 2024.10.2. - [Release notes](https://github.com/scitools/workflows/releases) - [Commits](SciTools/workflows@2024.10.1...2024.10.2) --- updated-dependencies: - dependency-name: scitools/workflows dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Demo Numpy v2. * Force NumPy v2. * Store PP LB headers as signed ints (as specified in UMDP F3). * Correct PP tuple printing. * NumPy 2 compliant dtype casting in regridding. * Todo note in What's New. * Accept NumPy 2 avoiding up-casting dtype in integration NetCDF _get_scale_factor_add_offset. * Adapt NetCDF _ensure_valid_dtype() for NumPy v2. * Adapt maths handling of rhs scalar dtype - for NumPy v2. * Accept regrid KGO changes from changes to NumPy scalar arithmetic dtypes. * Correct FF tuple printing. * More changed NumPy scalar representations. * Accept more changes for NumPy scalar arithmetic dtypes. * Accept NIMROD changes from NumPy scalar aritmetic dtypes. * Revert "Accept NIMROD changes from NumPy scalar aritmetic dtypes." This reverts commit 664f523. * More consistent dtype casting in NIMROD load, plus minor change to known-good-outputs. * Accept more changes for NumPy scalar arithmetic dtypes. * Accept more changes for NumPy scalar arithmetic dtypes. * Demonstrate new mo_pack version. * More thorough use of float32 for mask testing. * Explicitly use the values of the pandas object in as_cube(). * Cube summary: convert any np.str_ instances to plain strings. * Unpin NumPy. * Fix doctests. Fix doctests. * Fix dtype handling in iris.util.regular_points for NumPy v2. * Update lock files. * Undo over-zealous doctest changes. * Remove dask/dask#11433 workaround. * What's New entry. * Missed doctest changes from f547662. * Revert "Undo over-zealous doctest changes." - valid since f547662. This reverts commit 8207e05.
* Improve handling of masks * Add whatsnew
…#6168) (SciTools#6194) * Enable factory references to create new dimensions on load. * Skip hanging tests. * Skip more hanging tests. * Adjust misleading comment. * Add policy control and auto-detect. NOTE: for now only load, not load_cubes/load_cube * Add temporary testcode. NB no actual test, just printout. * Replaced _CubeFilterCollection.merged() with combined(); replace uses in load;load_cube/load_cubes. * Fix licence header * Fix to handle empty reference correctly. * Fix tests. * Simplify policy options and tidy api. * More documentation of loading options. * Fix doctest. * Fix repeated combination. * Minor docs improvements. * Initial load functions testing (WIP). More * Integration tests for time-varying reference fields. * Fix test result. * Make grib test optional. * Review changes * Reinstate skipped tests. * Make combine_cubes work with plain lists; Make 'combine_cubes' private API. * Add tests for combine_cubes. * Add tests for LoadPolicy API. * Add special split-netcdf roundtrip testing. * Removed unwanted 'policy' keyword from iris.load . * Make LoadPolicy examples more consistent. * Review changes : documentation improvements. * Doctest fix * fix controlling_merge docs * LOAD_POLICY uses 'default' settings by default. * Various quick fixes to legacy tests. * Added whatsnew. --------- Co-authored-by: Patrick Peglar <[email protected]>
* Initial fix ... * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Cleaned up old comments. Extended unit test to cover inequality * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Removed dev comments * Elevated attribute comparison values to np.arrays * Added WhatsNew entry --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Reduce duplication in cf.py spanning checks.
Co-authored-by: Lockfile bot <[email protected]>
* added in a vertical rule for surface fields * added in PR # to whatsnew * added flags * tests * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fixed whatsnew * improved paramaterisation * added doc improvements * fixed underscore * doc changes * Fixed spacing error --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Specify meta in da.map_blocks * Improve tests * Add more tests * Add whatsnew * Specify dtype in map_complete_blocks and undo change to lazy_elementwise --------- Co-authored-by: Patrick Peglar <[email protected]>
* Update CF standard names table. * ADDED WHATSNEW
updates: - [github.com/astral-sh/ruff-pre-commit: v0.7.0 → v0.7.1](astral-sh/ruff-pre-commit@v0.7.0...v0.7.1) - [github.com/asottile/blacken-docs: 1.19.0 → 1.19.1](adamchainz/blacken-docs@1.19.0...1.19.1) - [github.com/pre-commit/mirrors-mypy: v1.12.1 → v1.13.0](pre-commit/mirrors-mypy@v1.12.1...v1.13.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
V3.11.x.mergeback
* upstream/main: (194 commits) Restore latest Whats New files. [pre-commit.ci] pre-commit autoupdate (SciTools#6205) correct major minor in whatsnew (SciTools#6202) What's new updates for v3.11.0rc0 . (SciTools#6201) Update CF standard names table. (SciTools#6200) Specify meta in dask.array.map_blocks (SciTools#5989) added in a vertical rule for surface fields (SciTools#5734) Updated environment lockfiles (SciTools#6197) Reduce duplication in cf.py spanning checks. (SciTools#6196) Fix attribute array comparison (SciTools#6181) Enable factory references to create new dimensions on load. (SciTools#6168) (SciTools#6194) Improve handling of masks in concatenate (SciTools#6187) Demo Numpy v2 (SciTools#6035) Bump scitools/workflows from 2024.10.1 to 2024.10.2 (SciTools#6186) Document use of new_axis to control merge (SciTools#6180) Updated environment lockfiles (SciTools#6184) [pre-commit.ci] pre-commit autoupdate (SciTools#6175) Updated environment lockfiles (SciTools#6183) Update to `cell_method` parsing (SciTools#6083) Bump scitools/workflows from 2024.10.0 to 2024.10.1 (SciTools#6179) ...
github-actions
bot
added
the
benchmark_this
ESadek-MO
merged commit 00f0e0c
into
SciTools:FEATURE_pytest_conversion
19 of 20 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🚀 Pull Request
Description
Consult Iris pull request check list
Add any of the below labels to trigger actions on this PR: