Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace pyke nopyke #4198

Merged
merged 53 commits into from
Jul 1, 2021
Merged
Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
f427f85
First steps in parallel rules implementation.
pp-mo May 19, 2021
1bb7338
Rename some things + add comments.
pp-mo May 21, 2021
44bf952
Headers, tweaks, reorg test__load_cube.
pp-mo May 21, 2021
5e3cb05
Fix handling of coord-systems.
pp-mo May 21, 2021
dfa6074
Remove extra cdl.
pp-mo May 21, 2021
1aa4676
Add more grid-mapping tests; tidy testcode structure a bit.
pp-mo Jun 1, 2021
87d3347
Test more grid types : rotated and some non-latlon (WIP).
pp-mo Jun 1, 2021
88a1b2d
Fix 'checker' call usage.
pp-mo Jun 2, 2021
ad3ec2e
Reorganise testcode inheritance to provide testclasses for pyke/nonpy…
pp-mo Jun 2, 2021
b58c4bc
Tests for all supported grid-mappings. Note which rules trigger in ea…
pp-mo Jun 2, 2021
04b079a
Disable testing against non-pyke code, for now.
pp-mo Jun 2, 2021
1e0833e
Revert old tests/test_netcdf.py
pp-mo Jun 2, 2021
b119c7b
Odd clarifying comments.
pp-mo Jun 2, 2021
364ea5b
Tidy testcase creation a bit.
pp-mo Jun 2, 2021
4487961
Tests for mapping-types mismatch between coords+grid-mapping; Test no…
pp-mo Jun 2, 2021
3f6e136
Refactor to put different test areas in their own sourcefiles.
pp-mo Jun 2, 2021
fe8ee7e
Small fix to actions code.
pp-mo Jun 6, 2021
75550fc
Move grid-mapping-specific content out of common load_cube__activate …
pp-mo Jun 6, 2021
97f2976
Add tests for time rules.
pp-mo Jun 6, 2021
6a82183
Simplify and remove unused keys; check coord classes; test dim+aux sh…
pp-mo Jun 6, 2021
b59f0e7
Simpler 'Opts' implementation.
pp-mo Jun 7, 2021
965ca8a
Tidy testing classes a bit.
pp-mo Jun 8, 2021
e3fd23d
Tests for hybrid vertical coords.
pp-mo Jun 8, 2021
2a6cfd8
Small review changes.
pp-mo Jun 8, 2021
e776618
Regularise per-test records of rules triggered.
pp-mo Jun 8, 2021
7f92f7b
Added tests for auxiliary lat+lon coords.
pp-mo Jun 8, 2021
3c00044
Tests for remaining miscellaneous rules.
pp-mo Jun 8, 2021
1cc4c7d
Review: fix typos.
pp-mo Jun 9, 2021
e50cdd5
Add testing option to compare pyke and nonpyke loads.
pp-mo Jun 9, 2021
2bfeff6
Fixes to grid-mapping/dimcoord actions: passing all compare-tests.
pp-mo Jun 9, 2021
72058b0
Actions for remaining 'miscellaneous' behaviour: All tests passing, i…
pp-mo Jun 9, 2021
f8a1bbe
Improved comments in actions routines.
pp-mo Jun 9, 2021
6eaf756
Added actions for formulae (aka hybrid coords, factories).
pp-mo Jun 10, 2021
09df997
Tiny fix.
pp-mo Jun 10, 2021
be9c0f1
Small review changes.
pp-mo Jun 15, 2021
0c5a5f6
Added basic tests for Engine class.
pp-mo Jun 22, 2021
b55a925
Raise actual warning for unrecognised formulae.
pp-mo Jun 22, 2021
0da7ef3
Remove unreachable warning code.
pp-mo Jun 22, 2021
4bba400
Remove unreachable rule-fail code.
pp-mo Jun 22, 2021
eb46d51
Testcase for multiple hybrid coordinates.
pp-mo Jun 22, 2021
ce1e438
Fix rotated-aux-latitude test.
pp-mo Jun 22, 2021
2fdcdf9
Isort fixes.
pp-mo Jun 23, 2021
f985b0c
Remove pyke and simplify testing.
pp-mo Jun 15, 2021
b0ac323
Ensure a definite ordering for formula-root processing.
pp-mo Jun 23, 2021
c26db97
Odd corrections to comments.
pp-mo Jun 23, 2021
2f9d462
Updated all 'rules triggered' comments.
pp-mo Jun 23, 2021
c87fca8
Fix scope-bleed from actions test debugging, and turn it off.
pp-mo Jun 23, 2021
b40a446
Updated lockfiles.
pp-mo Jun 29, 2021
9cb18fa
Small fixes to comments.
pp-mo Jun 29, 2021
a05f7b6
Remove refs to pyke in project config files.
pp-mo Jun 30, 2021
794cab5
Review changes for comments: fix, clarify + make consistent.
pp-mo Jun 30, 2021
97b20aa
Review change: correct test comment.
pp-mo Jul 1, 2021
16be67b
Review changes: clarify comments.
pp-mo Jul 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ pip-cache
# Created by Iris build
*.so
lib/iris/etc/site.cfg
lib/iris/fileformats/_pyke_rules/compiled_krb/
lib/iris/std_names.py

# Iris test result files
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ include CHANGES COPYING COPYING.LESSER

# Files from setup.py package_data that are not automatically added to source distributions
recursive-include lib/iris/tests/results *.cml *.cdl *.txt *.xml *.json
recursive-exclude lib/iris/fileformats/_pyke_rules/compiled_krb *
recursive-include lib/iris/etc *
include lib/iris/fileformats/_pyke_rules/*.krb

recursive-include requirements *

Expand Down
1 change: 0 additions & 1 deletion asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"scipy": [],

"setuptools": [],
"pyke": [],
"six": [],

"nose": [],
Expand Down
2 changes: 1 addition & 1 deletion docs/src/developers_guide/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ To do this perform the following steps.
Create a conda environment with the appropriate conda packages to build the
source distribution (``sdist``) and pure Python wheel (``bdist_wheel``)::

> conda create -n iris-pypi -c conda-forge --yes pip pyke python setuptools twine wheel
> conda create -n iris-pypi -c conda-forge --yes pip python setuptools twine wheel
> . activate iris-pypi

Checkout the appropriate Iris ``<release>`` tag from the appropriate ``<repo>``.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ The rest can be done with pip. Begin with numpy::
Finally, Iris and its Python dependencies can be installed with the following
command::

pip3 install setuptools cftime==1.2.1 cf-units scitools-pyke scitools-iris
pip3 install setuptools cftime==1.2.1 cf-units scitools-iris

This procedure was tested on a Ubuntu 20.04 system on the
27th of January, 2021.
Expand Down
16 changes: 16 additions & 0 deletions lib/iris/fileformats/_nc_load_rules/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright Iris contributors
#
# This file is part of Iris and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
"""
Support for cube-specific CF-to-Iris translation operations.

Interprets CF concepts identified by :mod:`iris.fileformats.cf` to add
components into loaded cubes.

For now : the API mimics :class:`pyke.knowledge_engine.engine`.
As this is aiming to replace the old Pyke-based logic rules.
TODO: simplify once the parallel operation with Pyke is no longer required.

"""
Loading