bootstrap ci for 3.0.x #4154

bjlittle · 2021-05-25T14:24:25Z

🚀 Pull Request

Description

This PR breaths life back into the v3.0.x release feature branch.

It includes a hybrid collection of fixes from master and @rcomer to bootstrap the CI.

Note that, the recent GH action magic to auto-create conda-lock files is not fully implemented here. There is no GH action, as per master, but the same infra-structure is in-place but with statically created lock files.

Consult Iris pull request check list

* fix add_weekday * fix black link

bjlittle · 2021-05-25T14:29:59Z

docs/iris/src/developers_guide/contributing_code_formatting.rst

@@ -39,7 +39,7 @@ linted according to our ``.flake8`` configuration file. Note that,
 for each ``.pre-commit-config.yaml`` git hook.

 Additionally, you may wish to enable ``black`` for your preferred
-`editor/IDE <https://black.readthedocs.io/en/stable/editor_integration.html#editor-integration>`_.
+`editor/IDE <https://black.readthedocs.io/en/stable/integrations/editors.html>`_.


This was causing a linkcheck failure.

bjlittle · 2021-05-25T14:30:31Z

lib/iris/fileformats/netcdf.py

@@ -1043,7 +1043,7 @@ def write(
            dtype(i.e. 'i2', 'short', 'u4') or a dict of packing parameters as
            described below. This provides support for netCDF data packing as
            described in
-            http://www.unidata.ucar.edu/software/netcdf/docs/BestPractices.html#bp_Packed-Data-Values
+            http://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data_Values


Again, this was causing a linkcheck failure

Suggested change

http://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data_Values

https://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data-Values

bjlittle · 2021-05-25T14:31:01Z

lib/iris/coord_categorisation.py

-    #  - We will want to do better, when we sort out our own Calendars.
-    #  - For now, just make sure these all call through this one function.
-    return coord.units.num2date(time)
+    return coord.units.num2date(time, only_use_cftime_datetimes=True)


Ported change, merge to my branch, thanks to @rcomer 😄

lbdreyer · 2021-05-25T14:34:55Z

lib/iris/fileformats/netcdf.py

@@ -1043,7 +1043,7 @@ def write(
            dtype(i.e. 'i2', 'short', 'u4') or a dict of packing parameters as
            described below. This provides support for netCDF data packing as
            described in
-            http://www.unidata.ucar.edu/software/netcdf/docs/BestPractices.html#bp_Packed-Data-Values
+            http://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data_Values


A bit of an overlap with the changes in here: https://github.com/SciTools/iris/pull/4132/files, but we can rebase after we've merged

I think #4132 will be redundant once all tests are passing.

rcomer · 2021-05-25T14:52:02Z

lib/iris/fileformats/netcdf.py

@@ -1043,7 +1043,7 @@ def write(
            dtype(i.e. 'i2', 'short', 'u4') or a dict of packing parameters as
            described below. This provides support for netCDF data packing as
            described in
-            http://www.unidata.ucar.edu/software/netcdf/docs/BestPractices.html#bp_Packed-Data-Values
+            http://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data_Values


Suggested change

http://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data_Values

https://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data-Values

rcomer · 2021-05-25T14:53:25Z

lib/iris/fileformats/netcdf.py

@@ -2589,7 +2589,7 @@ def save(
        (i.e. 'i2', 'short', 'u4') or a dict of packing parameters as described
        below or an iterable of such types, strings, or dicts.
        This provides support for netCDF data packing as described in
-        http://www.unidata.ucar.edu/software/netcdf/docs/BestPractices.html#bp_Packed-Data-Values
+        http://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data_Values


Suggested change

http://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data_Values

https://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data-Values

rcomer

Suggested link change got tests passing at bjlittle#33

rcomer

Suggested link change got tests passing at bjlittle#33

.cirrus.yml

bjlittle · 2021-05-25T16:16:09Z

@lbdreyer Brilliant. Thanks 😄

@trexfeathers

* Add release highlights and pin rc version (#3898) * Add release highlights and pin rc version * review actions * reorder release highlights (#3899) Tweak release highlights * Add whatsnew announcement (#3900) * Fix spelling (#3903) * Fix unit label handling (#3902) * Add failing test of plotting * Implement fix to pass test * Update idiff to ignore irrelevant hyphens in path * Update imagerepo (following docs) * Update after review by @trexfeathers * Add whatsnew entries * Move whatsnew entries into correct file * Release Docs Improvements (#3895) * Minor phrasing change in 'Release candidate'. * Before release deprecations. * Whatsnew highlights section. * Relax setup.py setup requirements (#3909) * Updated CF saver version in User Guide and docstring (#3925) * Updated CF saver version in User Guide and docstring * Remove references to CF version of the loader in docstrings * Added whatsnew * Pin cftime<1.3.0 * Migrate to cirrus-ci (#3928) * migrate from travis-ci to cirrus-ci * added whatsnew entries * ignore url for doc link check (#3929) * whatsnew for coord default units (#3924) * Cube._summary_coord_extra: efficiency and bugfix (#3922) * Add Documentation Title Case Capitalization (#3940) * Use Title Case Capitalisation for Documentation * add whatsnew enter * CI requirements drop pip packages (#3939) * requirements pip to conda * use pip install over develop * default PY_VER to python versions * update links (#3942) * update links * added s to http * Add support for 1-d weights in collapse. (#3943) * Remove warning for convert_units on lazy data (#3951) * drop stickler references in docs (#3953) * drop stickler references in docs * remove sticker from common links * update docs for travis-ci to cirrus-ci (#3954) * update docs for travis-ci to cirrus-ci * add 'travis-ci' reference locally to whatsnew * update whatsnew comment * docs for nox (#3955) * docs for nox * add titles, notices and additional detail * review actions * Resolve test coverage (#3947) * test coverage for __init__ and __call__ * test coverage for metadata resolve and coverage * partial test coverage for metadata mapping * python 3.6 workaround for deepcopy of mock.sentinel * test coverage for Resolve._free_mapping * test coverage for Resolve convenience methods * add test stub for Resolve._metadata_mapping * fix Test__tgt_cube_position * test coverage for shape * test coverage for _as_compatible_cubes * test coverage for Resolve._metadata_mapping * test coverage for Resolve._prepare_common_dim_payload * test coverage for Resolve._prepare_common_aux_payload * test coverage for Resolve._prepare_points_and_bounds * test coverage for Resolve._create_prepared_item * test coverage for Resolve._prepare_local_payload_dim * test coverage for Resolve._prepare_local_payload_aux * test coverage for Resolve._prepare_local_payload_scalar + docs URL skip * test coverage for Resolve._prepare_local_payload * test coverage for Resolve._metadata_prepare * added docs URL linkcheck skip * test coverage for Resolve._prepare_factory_payload * test coverage for Resolve._get_prepared_item * review actions * test coverage for Resolve.cube * pin v3.0.0 version and whatnew date (#3956) * update github ci checks image (#3957) * Promote unknown units to dimensionless in aux factories (#3965) * promote unknown to dimensionless units in aux factories * patch aux factories to promote unknown to dimensionless units for formula terms * add whatnew PR for entry * Release branch prepare for v3.0.2 (#4044) * update intersphinx mapping and matplotlib urls (#4003) * update intersphinx mapping and matplotlib urls * use matplotlib intersphinx where possible * review actions * review actions * cirrus-ci compute credits (#4007) * cirrus-ci conditional tasks (#4019) * cirrus-ci conditional tasks * use bc for bash arithmetic * revert back to sed * use expr * reword * minor documentation changes * review actions * prepare v3.0.2 release * Fix test_incompatible_dimensions test (#3977) * test_incompatible_dimensions used a ragged array for the test, which has been deprecated in numpy, and now fails if dtype is anything other than object. This test appears to be checking that the addition of a [2x4] masked array to a [2x3] masked cube should raise a ValueError. This commit fixes the creation of `data3` object to be a [2x4] non-ragged array. * Added entry to what's new * Added name to core developer list :) * Update latest.rst Fixed space in PR macro call * update whatsnew v3.0.2 Co-authored-by: James Penn <[email protected]> * um_stash_source attribute improved handling (#4035) * Modified pyke rule * Tests added * Black and whatsnew * Include PR number * Remove latest.rst * Add what's new * Support for py38 and Cartopy 0.19 (#4130) * mpl 3.4.1 updates (#4087) * replace most recent hashes (#4112) * Corrected plot_anomaly_log_colouring for new Matplotlib linscale rules. (#4115) * Cartopy 0.19 updates (#4128) * Use assertArrayAllClose for sqrt test (#4118) * using AllClose for sqrt test * Omitting the checksum from test cml * use ArrayAllClose (rebase reset it?) * Iris py38 (#3976) * support for py38 * update CI and noxfile * enforce alphabetical xml element attribute order * full tests for py38 + fix docs-tests * add whatsnew entry * update doc-strings + review actions * Alternate xml handling routine (#29) * all xml tests pass for nox tests-3.8 * restored docstrings * move sort_xml_attrs * make sort_xml_attrs a classmethod * update sort_xml_attr doc-string Co-authored-by: Bill Little <[email protected]> * add jamesp to whatsnew + minor tweak Co-authored-by: James Penn <[email protected]> * reinstate black and nox links * Linkcheck update (#4104) * Updated links * Added login remark * Removed extra space * change to kick cirrus * kick cirrus * test verbose on cirrus * Removed test settings. Co-authored-by: Bill Little <[email protected]> Co-authored-by: Martin Yeo <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: James Penn <[email protected]> Co-authored-by: James Penn <[email protected]> Co-authored-by: tkknight <[email protected]> * Intersection bounds fix (replacement PR) (#4059) * fix intersection out of bounds point * fix intersection out of bounds point take 2 * add referencing comment * bootstrap ci for 3.0.x (#4154) * add cirrus-ci docker support * wip * wip * wip * wip * wip * add pip * revert docker * fix add_weekday (#32) * fix add_weekday * fix black link * fix link Co-authored-by: Ruth Comer <[email protected]> * Tweak to speed up dask wrapping of netcdf variables (#4135) * Use 'meta' in da.from_array to stop it sampling netcdf variables, which is quite slow. * Fix PR number. * Fix test. * Review changes. * Update docs/iris/src/whatsnew/3.0.2.rst Co-authored-by: lbdreyer <[email protected]> * Fb fix cube coord arithmetic (#4159) * fix coord with cube arithmetic * add coord arithmetic test coverage * add a whatsnew entry * Pp daskfix (#4141) * Remove workaround when dask-wrapping PP data, obsoleted by #4135. * Remove old slice testing * Add whats new * move whitespace? * missing line Co-authored-by: lbdreyer <[email protected]> * add release date to v3.0.2 whatsnew (#4160) * update readme logo img src and href (#4006) (#4216) * In cube.intersection, find split cells using a tolerant equality check (#4220) * In cube.intersection, find split cells using a tolerant equality check * remove unused var * Add bounds check to tests; add what's new * Fix whats new; update version number * Update 3.0.3.rst Update release date in `3.0.3.rst` * Wide cubestr fix 3v0vx v2 (#4233) * Widen cube printout for long ancil or cell-measure names. * Adjust result for fixed cube-units printout. * Added whatsnew. * Include newest whatsnew in index. * Review: fix whatsnew structure. * Fix initial sections display. * Fix some typos in the cube maths docs (#4248) * (More of) Wide cubestr fix 3v0vx v2 (#4238) * Fix whatsnew for #4233. * Move 'empty slicings' whatsnew entry to 3.0.2 section. * unpin cftime (#4222) * Test wrangling vs v3.0.x (#4249) * test changes * add awol init * rename system test cases * fix PartialDateTime tests * fix typo * add whatsnew * Fix mergeback PR #4035 * Fix mergeback PR #4035 tests * Update mergeback nox conda-lock files Co-authored-by: tkknight <[email protected]> Co-authored-by: Zeb Nicholls <[email protected]> Co-authored-by: Martin Yeo <[email protected]> Co-authored-by: Jon Seddon <[email protected]> Co-authored-by: Ruth Comer <[email protected]> Co-authored-by: Patrick Peglar <[email protected]> Co-authored-by: James Penn <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: James Penn <[email protected]> Co-authored-by: Ruth Comer <[email protected]> Co-authored-by: lbdreyer <[email protected]> Co-authored-by: lbdreyer <[email protected]>

bjlittle and others added 9 commits May 25, 2021 00:58

add cirrus-ci docker support

e83e551

wip

13d8c02

wip

b713451

wip

db58d9a

wip

55f30aa

wip

e8bd3ad

add pip

d8fbd56

revert docker

56b9cb8

fix add_weekday (#32)

a89bead

* fix add_weekday * fix black link

bjlittle assigned lbdreyer May 25, 2021

bjlittle added the New: Pull Request label May 25, 2021

bjlittle changed the title ~~Fb ci docker~~ bootstrap ci for 3.0.x May 25, 2021

bjlittle commented May 25, 2021

View reviewed changes

lbdreyer reviewed May 25, 2021

View reviewed changes

rcomer reviewed May 25, 2021

View reviewed changes

lbdreyer reviewed May 25, 2021

View reviewed changes

.cirrus.yml Show resolved Hide resolved

fix link

cc1ef75

bjlittle force-pushed the fb-ci-docker branch from b4e8335 to cc1ef75 Compare May 25, 2021 15:42

This was referenced May 25, 2021

Unidata links bjlittle/iris#33

Closed

Fix broken links and gallery test #4132

Closed

lbdreyer merged commit 38bfb6c into SciTools:v3.0.x May 25, 2021

lbdreyer mentioned this pull request Jun 7, 2021

Prep for 0.17.1 release SciTools/iris-grib#272

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bootstrap ci for 3.0.x #4154

bootstrap ci for 3.0.x #4154

bjlittle commented May 25, 2021 •

edited

Loading

bjlittle May 25, 2021

bjlittle May 25, 2021

rcomer May 25, 2021

bjlittle May 25, 2021

lbdreyer May 25, 2021

rcomer May 25, 2021

rcomer May 25, 2021

rcomer May 25, 2021

rcomer left a comment

rcomer left a comment

bjlittle commented May 25, 2021

	http://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data_Values
	https://www.unidata.ucar.edu/software/netcdf/documentation/NUG/best_practices.html#bp_Packed-Data-Values

bootstrap ci for 3.0.x #4154

bootstrap ci for 3.0.x #4154

Conversation

bjlittle commented May 25, 2021 • edited Loading

🚀 Pull Request

Description

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rcomer left a comment

Choose a reason for hiding this comment

rcomer left a comment

Choose a reason for hiding this comment

bjlittle commented May 25, 2021

bjlittle commented May 25, 2021 •

edited

Loading