Merge main into mesh-data-model#4247
Closed
trexfeathers wants to merge 55 commits intoSciTools:mesh-data-modelfrom
Closed
Merge main into mesh-data-model#4247trexfeathers wants to merge 55 commits intoSciTools:mesh-data-modelfrom
main into mesh-data-model#4247trexfeathers wants to merge 55 commits intoSciTools:mesh-data-modelfrom
Conversation
* introducing lock files for testing * Testing github refresh workflow * Update refresh-lockfiles.yml * Update refresh-lockfiles.yml * Action making lockfiles and setting as artifacts * Update refresh-lockfiles.yml * Update refresh-lockfiles.yml * Update refresh-lockfiles.yml * Update refresh-lockfiles.yml * Update refresh-lockfiles.yml * Added PR creation * Cleanup refresh-lockfiles.yml Comments and cron scheduling for refresh-lockfiles workflow * Update .cirrus.yml noxfile now handles out of date environments, so no need to invalidate the cache in the cirrus configuration * Update refresh-lockfiles.yml * Back to cartopy 0.18 * Script for updating lockfiles * License header on update_lockfiles script * testing reupload_on_changes key in nox cache * Documentation update * Added whats new entry * Fixed a horrendous number of typos * Type annotations in the noxfile completed * switched os.path -> pathlib in tools/update_lockfiles.py * Apply suggestions from @trexfeathers code review Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com> * Updated imagehashes Picked from SciTools@566f187 * Updated documentation of the github workflow * Updated image hash for anomaly log plot * Reverting imagerepo.json to state at 48e39b5 Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
* Updated links * Added login remark * Removed extra space * change to kick cirrus * kick cirrus * test verbose on cirrus * Removed test settings.
I read the documentation for this action incorrectly. Without the `branch_suffix` setting, if a PR already exists for this action, it will be updated rather than creating a new one. This is probably the preferred option.
* using AllClose for sqrt test * Omitting the checksum from test cml * use ArrayAllClose (rebase reset it?)
* Updated environment lockfiles * updates for Cartopy 0.19 (SciTools#4128) Co-authored-by: trexfeathers <trexfeathers@users.noreply.github.com> Co-authored-by: Ruth Comer <ruth.comer@metoffice.gov.uk>
* update bug and feature templates * fix broken link + add whatsnew
* check data max * add test * whatsnew * fix PR number
* update pre-commit packages * blackify files to new version * review actions * update pyproject.toml
* Add a method to return a CubeList from CubeList.copy() * Created an entry in What's New * Added test for CubeList.copy() * Moved CubeList.copy() test into the correct file * Creating a link to the username
updates: - [github.com/psf/black: 21.5b1 → 21.5b2](psf/black@21.5b1...21.5b2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Adding a clobber check to update lockfile workflow * actions syntax error * actions syntax error * debugging context * debugging context * debugging context * Clobber override support * Clobber with yes/true only * refresh-lockfiles workflow comment cleanup * Added documentation
* bump black version * unpin black * pin black
* drop py36 support * add a whatsnew entry * review actions * warn assert oddness on ci * update pyproject.toml * remove py36-linux-64.lock file
* RTD support link update * review actions
* update CONTRIBUTING.md * review actions
* Updated environment lockfiles * Fix add_weekday. (SciTools#4169) Co-authored-by: Lockfile bot <noreply@github.com> Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
* refactor setup.py to setup.cfg * add keywords * added a whatsnew entry * review actions * review actions * rebase with review actions * review actions
Co-authored-by: Lockfile bot <noreply@github.com>
updates: - [github.com/psf/black: 21.5b2 → 21.6b0](psf/black@21.5b2...21.6b0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lockfile bot <noreply@github.com>
* adopt automated import sorting * resolve circular imports * rename isort pre-commit git-hook * fix LBPROC_PAIRS * set isort known-first-party * fix circular import dependencies * rebase with minor tweak * review actions * add whatsnew entry * isort force sort within sections * remove import cycle * break util/coords cycle * add test imports
Co-authored-by: Lockfile bot <noreply@github.com>
* change master to main references * black + flake8 + isort nox with abs paths * review actions * added a whatsnew entry * review actions
* pre-commit blacked docs * add whatsnew entry
* drop black and flake8 dependencies * use pre-commit for ci * added additional whatsnew entry * review actions * review actions - align hooks cli
Co-authored-by: Lockfile bot <noreply@github.com>
updates: - [github.com/asottile/blacken-docs: v1.8.0 → v1.10.0](adamchainz/blacken-docs@v1.8.0...v1.10.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* First steps in parallel rules implementation. * Rename some things + add comments. * Headers, tweaks, reorg test__load_cube. * Fix handling of coord-systems. * Remove extra cdl. * Add more grid-mapping tests; tidy testcode structure a bit. * Test more grid types : rotated and some non-latlon (WIP). * Fix 'checker' call usage. * Reorganise testcode inheritance to provide testclasses for pyke/nonpyke. Replace 'bad mapping' control with scale-factor key. **NOTE** non-pyke bad mercatorhas outstanding test failures -- to be fixed. * Tests for all supported grid-mappings. Note which rules trigger in each case. * Disable testing against non-pyke code, for now. * Revert old tests/test_netcdf.py * Odd clarifying comments. * Tidy testcase creation a bit. * Tests for mapping-types mismatch between coords+grid-mapping; Test nonmonotonic dimcoord values; Test warnings (or not). * Refactor to put different test areas in their own sourcefiles. * Small fix to actions code. * Move grid-mapping-specific content out of common load_cube__activate code. * Add tests for time rules. * Simplify and remove unused keys; check coord classes; test dim+aux shared dim. * Simpler 'Opts' implementation. * Tidy testing classes a bit. * Tests for hybrid vertical coords. * Small review changes. * Regularise per-test records of rules triggered. * Added tests for auxiliary lat+lon coords. * Tests for remaining miscellaneous rules. * Review: fix typos. * Add testing option to compare pyke and nonpyke loads. * Fixes to grid-mapping/dimcoord actions: passing all compare-tests. * Actions for remaining 'miscellaneous' behaviour: All tests passing, including pyke == nonpyke checks. * Improved comments in actions routines. * Added actions for formulae (aka hybrid coords, factories). * Tiny fix. * Small review changes. * Added basic tests for Engine class. * Raise actual warning for unrecognised formulae. * Remove unreachable warning code. * Remove unreachable rule-fail code. * Testcase for multiple hybrid coordinates. * Fix rotated-aux-latitude test. * Isort fixes. * Remove pyke and simplify testing. * Ensure a definite ordering for formula-root processing. * Odd corrections to comments. * Updated all 'rules triggered' comments. * Fix scope-bleed from actions test debugging, and turn it off. * Updated lockfiles. * Small fixes to comments. * Remove refs to pyke in project config files. * Review changes for comments: fix, clarify + make consistent. * Review change: correct test comment. * Review changes: clarify comments.
Co-authored-by: Lockfile bot <noreply@github.com>
* pre-commit isort and black --check only for cirrus-ci * run discovered hooks, with exclusion * review actions * match on pre-commit hook id * add clarifying comment to nox * support pre-commit excluded hooks * rebrand lint to precommit
Co-authored-by: Lockfile bot <noreply@github.com>
* Documented the --force option on conda env create * updated whats new
updates: - [github.com/pycqa/isort: 5.9.1 → 5.9.2](PyCQA/isort@5.9.1...5.9.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Lockfile bot <noreply@github.com>
Contributor
Author
|
Needs more work to remove extra pyke rules dependencies we introduced as part of |
Contributor
Author
|
Superseded by #4254. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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
A merge-back PR.
Note I observed some timeout errors while running local testing. Hopefully won't be observed in CI.
Consult Iris pull request check list