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

Re-worked setup.py to avoid the need for separate/non-standard build commands #2891

Merged
merged 4 commits into from
Nov 2, 2017

Conversation

pelson
Copy link
Member

@pelson pelson commented Oct 30, 2017

This PR closes #2481 by standardising the build/develop/install process used by iris' setup.
This change is necessary if we ever want pip install scitools-iris to function correctly (without the need for extra python setup.py pyke_rules/std_names calls).

I've tested this quite extensively on a python3 environment on OSX using both the source repository and a build sdist.



class SetupTestRunner(TestRunner, setuptools.Command):
class SetupTestRunner(TestRunner, Command):
Copy link
Member Author

Choose a reason for hiding this comment

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

Was almost tempted to pull the import into this class, and make the runner import entirely lazy...

…coding testing in travis. This is because we are explicitly testing the checked out repository, not a built/installed package.
Copy link
Member

@DPeterK DPeterK left a comment

Choose a reason for hiding this comment

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

There are loads of tests being skipped in this PR ⚠️ looks like test data isn't being found.

@@ -82,6 +86,13 @@ def finalize_options(self):
pass

def run(self):
pass
Copy link
Member

@bjlittle bjlittle Nov 1, 2017

Choose a reason for hiding this comment

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

I guess using an ABC abstractmethod would be too much?

It's the only method that's specialized in the sub-classes, otherwise this class is nop

Copy link
Member Author

Choose a reason for hiding this comment

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

Definitely too much. In almost all situations 😉
I'm not going to do this one unless you push me to. Is that OK?

Copy link
Member

Choose a reason for hiding this comment

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

Just a passing comment, I really didn't expect you to make that change 👍


def custom_cmd(command_to_override, functions, help_doc=""):
Copy link
Member

@bjlittle bjlittle Nov 1, 2017

Choose a reason for hiding this comment

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

command_to_override -> cls ? ... that's kinda what it is, or at least what we expect

Copy link
Member Author

Choose a reason for hiding this comment

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

Compromise? command_cls_to_override?

Copy link
Member

Choose a reason for hiding this comment

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

@pelson This change got lost in the noise ... although, I'm not going to lose any sleep if you don't do it 😜

fi

# iris
- python setup.py --quiet build
- python setup.py --quiet install
Copy link
Member

Choose a reason for hiding this comment

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

The test_pep8_conformance is failing as (I think) the rule are not being compiled and installed.

On install it is compiling the rules but (I think) they are relative to the root i.e. in the same directory as the setup.py, and thus not being installed, hence why on installation there are no compiled rules for the kb.

The the problem in within the setup.py refactor of the compile_pyke_rules

@@ -160,5 +151,7 @@ script:
fi
- if [[ $TEST_TARGET == 'coding' ]]; then
cd $INSTALL_DIR;
python setup.py pyke_rules;
python setup.py std_names;
Copy link
Member

@bjlittle bjlittle Nov 1, 2017

Choose a reason for hiding this comment

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

At this point, (I think) it's too late to compile the rules, as it'll put the compiled rules in the lib (if anywhere) and won't be installed (which has already happened), and so won't be used

Copy link
Member Author

Choose a reason for hiding this comment

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

Aha, but this is in the coding block, which actually checks the source, not the installed version. Caught me out too!

Copy link
Member

Choose a reason for hiding this comment

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

But it's the travis coding pep8 tests that are failing ... hinting (to me) that the compiled files aren't where they should be ... ? They might be in the lib source, but aren't the tests running against the installed version of iris?

Copy link
Member Author

Choose a reason for hiding this comment

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

They weren't for standard_names (at least, that is what I observed in an earlier commit!)

Copy link
Member

Choose a reason for hiding this comment

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

Hmmm something isn't quite as it seems. Not quite sure what's going on ...

setup.py Outdated

knowledge_engine.engine('')
Copy link
Member

Choose a reason for hiding this comment

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

Compiling the rules and putting them in the right place thru python setup.py install isn't working from what I can see ...

Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

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

Appears to be some issues with compiling the pyke rules and where the test data is living (due to the travis tests being skipped)

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

For my own record as much as anything else:

python setup.py pyke_rules continues to behave as expected:

(iris_dev) pelson@~/dev/scitools/iris> python
Python 2.7.11 |Continuum Analytics, Inc.| (default, Dec  6 2015, 18:57:58) 
[GCC 4.2.1 (Apple Inc. build 5577)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
Anaconda is brought to you by Continuum Analytics.
Please check out: http://continuum.io/thanks and https://anaconda.org
>>> 
(iris_dev) pelson@~/dev/scitools/iris> rm -rf lib/iris/fileformats/_pyke_rules/compiled_krb
(iris_dev) pelson@~/dev/scitools/iris> python setup.py pyke_rules
running pyke_rules
writing [iris.fileformats._pyke_rules.compiled_krb]/fc_rules_cf_fc.py
writing [iris.fileformats._pyke_rules.compiled_krb]/compiled_pyke_files.py
(iris_dev) pelson@~/dev/scitools/iris> ll lib/iris/fileformats/_pyke_rules/compiled_krb
total 400
-rw-r--r--  1 pelson  staff   83375  2 Nov 11:50 fc_rules_cf_fc.pyc
-rw-r--r--  1 pelson  staff  110014  2 Nov 11:50 fc_rules_cf_fc.py
-rw-r--r--  1 pelson  staff     445  2 Nov 11:50 compiled_pyke_files.py
-rw-r--r--  1 pelson  staff     176  2 Nov 11:50 __init__.pyc
-rw-r--r--  1 pelson  staff       0  2 Nov 11:50 __init__.py

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

python setup.py install is doing the right thing:

(iris_dev) pelson@~/dev/scitools/iris> rm -rf build; rm -rf lib/iris/fileformats/_pyke_rules/comp* lib/iris/std_names.py
(iris_dev) pelson@~/dev/scitools/iris> pip uninstall -y iris
Uninstalling Iris-2.0a0:
  Successfully uninstalled Iris-2.0a0
(iris_dev) pelson@~/dev/scitools/iris> python setup.py install > build.log 2>&1
(iris_dev) pelson@~/dev/scitools/iris> cat build.log | grep -v tests | grep -v palette
running install
running bdist_egg
running egg_info
writing lib/Iris.egg-info/PKG-INFO
writing top-level names to lib/Iris.egg-info/top_level.txt
writing dependency_links to lib/Iris.egg-info/dependency_links.txt
writing pbr to lib/Iris.egg-info/pbr.json
reading manifest file 'lib/Iris.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no previously-included files matching '*.pyc' found anywhere in distribution
warning: no previously-included files matching '__pycache__' found anywhere in distribution
writing manifest file 'lib/Iris.egg-info/SOURCES.txt'
installing library code to build/bdist.macosx-10.5-x86_64/egg
running install_lib
running build_py
creating build
creating build/lib
creating build/lib/iris
copying lib/iris/__init__.py -> build/lib/iris
copying lib/iris/_concatenate.py -> build/lib/iris
copying lib/iris/_constraints.py -> build/lib/iris
copying lib/iris/_cube_coord_common.py -> build/lib/iris
copying lib/iris/_data_manager.py -> build/lib/iris
copying lib/iris/_deprecation.py -> build/lib/iris
copying lib/iris/_lazy_data.py -> build/lib/iris
copying lib/iris/_merge.py -> build/lib/iris
copying lib/iris/aux_factory.py -> build/lib/iris
copying lib/iris/config.py -> build/lib/iris
copying lib/iris/coord_categorisation.py -> build/lib/iris
copying lib/iris/coord_systems.py -> build/lib/iris
copying lib/iris/coords.py -> build/lib/iris
copying lib/iris/cube.py -> build/lib/iris
copying lib/iris/exceptions.py -> build/lib/iris
copying lib/iris/iterate.py -> build/lib/iris
copying lib/iris/pandas.py -> build/lib/iris
copying lib/iris/plot.py -> build/lib/iris
copying lib/iris/quickplot.py -> build/lib/iris
copying lib/iris/symbols.py -> build/lib/iris
copying lib/iris/time.py -> build/lib/iris
copying lib/iris/util.py -> build/lib/iris
creating build/lib/iris/analysis
copying lib/iris/analysis/__init__.py -> build/lib/iris/analysis
copying lib/iris/analysis/_area_weighted.py -> build/lib/iris/analysis
copying lib/iris/analysis/_interpolation.py -> build/lib/iris/analysis
copying lib/iris/analysis/_regrid.py -> build/lib/iris/analysis
copying lib/iris/analysis/_scipy_interpolate.py -> build/lib/iris/analysis
copying lib/iris/analysis/calculus.py -> build/lib/iris/analysis
copying lib/iris/analysis/cartography.py -> build/lib/iris/analysis
copying lib/iris/analysis/geometry.py -> build/lib/iris/analysis
copying lib/iris/analysis/maths.py -> build/lib/iris/analysis
copying lib/iris/analysis/stats.py -> build/lib/iris/analysis
copying lib/iris/analysis/trajectory.py -> build/lib/iris/analysis
creating build/lib/iris/experimental
copying lib/iris/experimental/__init__.py -> build/lib/iris/experimental
copying lib/iris/experimental/animate.py -> build/lib/iris/experimental
copying lib/iris/experimental/concatenate.py -> build/lib/iris/experimental
copying lib/iris/experimental/equalise_cubes.py -> build/lib/iris/experimental
copying lib/iris/experimental/raster.py -> build/lib/iris/experimental
copying lib/iris/experimental/regrid.py -> build/lib/iris/experimental
copying lib/iris/experimental/regrid_conservative.py -> build/lib/iris/experimental
copying lib/iris/experimental/stratify.py -> build/lib/iris/experimental
copying lib/iris/experimental/ugrid.py -> build/lib/iris/experimental
copying lib/iris/experimental/um.py -> build/lib/iris/experimental
creating build/lib/iris/fileformats
copying lib/iris/fileformats/__init__.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/_ff.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/_ff_cross_references.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/_pp_lbproc_pairs.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/_structured_array_identification.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/abf.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/cf.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/dot.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/name.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/name_loaders.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/netcdf.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/nimrod.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/nimrod_load_rules.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/pp.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/pp_load_rules.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/pp_save_rules.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/rules.py -> build/lib/iris/fileformats
copying lib/iris/fileformats/um_cf_map.py -> build/lib/iris/fileformats
creating build/lib/iris/io
copying lib/iris/io/__init__.py -> build/lib/iris/io
copying lib/iris/io/format_picker.py -> build/lib/iris/io
creating build/lib/iris/fileformats/_pyke_rules
copying lib/iris/fileformats/_pyke_rules/__init__.py -> build/lib/iris/fileformats/_pyke_rules
creating build/lib/iris/fileformats/um
copying lib/iris/fileformats/um/__init__.py -> build/lib/iris/fileformats/um
copying lib/iris/fileformats/um/_fast_load.py -> build/lib/iris/fileformats/um
copying lib/iris/fileformats/um/_fast_load_structured_fields.py -> build/lib/iris/fileformats/um
copying lib/iris/fileformats/um/_ff_replacement.py -> build/lib/iris/fileformats/um
copying lib/iris/fileformats/um/_optimal_array_structuring.py -> build/lib/iris/fileformats/um
creating build/lib/iris/etc
copying lib/iris/etc/site.cfg -> build/lib/iris/etc
copying lib/iris/etc/site.cfg.template -> build/lib/iris/etc
copying lib/iris/fileformats/_pyke_rules/fc_rules_cf.krb -> build/lib/iris/fileformats/_pyke_rules
/Users/pelson/miniconda/envs/iris_dev/bin/python tools/generate_std_names.py etc/cf-standard-name-table.xml build/lib/iris/std_names.py
/Users/pelson/miniconda/envs/iris_dev/bin/python -c import os; from pyke import knowledge_engine; from pyke.target_pkg import target_pkg; target_pkg.load = lambda *args, **kwargs: None; os.chdir(os.path.join('build/lib', 'iris', 'fileformats', '_pyke_rules')); knowledge_engine.engine('')
writing [compiled_krb]/fc_rules_cf_fc.py
writing [compiled_krb]/compiled_pyke_files.py
creating build/bdist.macosx-10.5-x86_64
creating build/bdist.macosx-10.5-x86_64/egg
creating build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/__init__.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/_concatenate.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/_constraints.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/_cube_coord_common.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/_data_manager.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/_deprecation.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/_lazy_data.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/_merge.py -> build/bdist.macosx-10.5-x86_64/egg/iris
creating build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/__init__.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/_area_weighted.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/_interpolation.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/_regrid.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/_scipy_interpolate.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/calculus.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/cartography.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/geometry.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/maths.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/stats.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/analysis/trajectory.py -> build/bdist.macosx-10.5-x86_64/egg/iris/analysis
copying build/lib/iris/aux_factory.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/config.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/coord_categorisation.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/coord_systems.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/coords.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/COPYING -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/COPYING.LESSER -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/cube.py -> build/bdist.macosx-10.5-x86_64/egg/iris
creating build/bdist.macosx-10.5-x86_64/egg/iris/etc
copying build/lib/iris/etc/site.cfg -> build/bdist.macosx-10.5-x86_64/egg/iris/etc
copying build/lib/iris/etc/site.cfg.template -> build/bdist.macosx-10.5-x86_64/egg/iris/etc
copying build/lib/iris/exceptions.py -> build/bdist.macosx-10.5-x86_64/egg/iris
creating build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/__init__.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/animate.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/concatenate.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/equalise_cubes.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/raster.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/regrid.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/regrid_conservative.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/stratify.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/ugrid.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
copying build/lib/iris/experimental/um.py -> build/bdist.macosx-10.5-x86_64/egg/iris/experimental
creating build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/__init__.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/_ff.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/_ff_cross_references.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/_pp_lbproc_pairs.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
creating build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/_pyke_rules
copying build/lib/iris/fileformats/_pyke_rules/__init__.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/_pyke_rules
copying build/lib/iris/fileformats/_pyke_rules/fc_rules_cf.krb -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/_pyke_rules
copying build/lib/iris/fileformats/_structured_array_identification.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/abf.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/cf.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/dot.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/name.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/name_loaders.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/netcdf.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/nimrod.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/nimrod_load_rules.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/pp.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/pp_load_rules.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/pp_save_rules.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
copying build/lib/iris/fileformats/rules.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
creating build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um
copying build/lib/iris/fileformats/um/__init__.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um
copying build/lib/iris/fileformats/um/_fast_load.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um
copying build/lib/iris/fileformats/um/_fast_load_structured_fields.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um
copying build/lib/iris/fileformats/um/_ff_replacement.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um
copying build/lib/iris/fileformats/um/_optimal_array_structuring.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um
copying build/lib/iris/fileformats/um_cf_map.py -> build/bdist.macosx-10.5-x86_64/egg/iris/fileformats
creating build/bdist.macosx-10.5-x86_64/egg/iris/io
copying build/lib/iris/io/__init__.py -> build/bdist.macosx-10.5-x86_64/egg/iris/io
copying build/lib/iris/io/format_picker.py -> build/bdist.macosx-10.5-x86_64/egg/iris/io
copying build/lib/iris/iterate.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/pandas.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/plot.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/quickplot.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/std_names.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/symbols.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/time.py -> build/bdist.macosx-10.5-x86_64/egg/iris
copying build/lib/iris/util.py -> build/bdist.macosx-10.5-x86_64/egg/iris
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/__init__.py to __init__.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/_concatenate.py to _concatenate.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/_constraints.py to _constraints.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/_cube_coord_common.py to _cube_coord_common.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/_data_manager.py to _data_manager.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/_deprecation.py to _deprecation.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/_lazy_data.py to _lazy_data.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/_merge.py to _merge.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/__init__.py to __init__.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/_area_weighted.py to _area_weighted.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/_interpolation.py to _interpolation.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/_regrid.py to _regrid.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/_scipy_interpolate.py to _scipy_interpolate.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/calculus.py to calculus.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/cartography.py to cartography.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/geometry.py to geometry.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/maths.py to maths.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/stats.py to stats.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/analysis/trajectory.py to trajectory.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/aux_factory.py to aux_factory.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/config.py to config.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/coord_categorisation.py to coord_categorisation.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/coord_systems.py to coord_systems.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/coords.py to coords.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/cube.py to cube.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/exceptions.py to exceptions.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/__init__.py to __init__.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/animate.py to animate.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/concatenate.py to concatenate.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/equalise_cubes.py to equalise_cubes.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/raster.py to raster.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/regrid.py to regrid.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/regrid_conservative.py to regrid_conservative.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/stratify.py to stratify.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/ugrid.py to ugrid.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/experimental/um.py to um.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/__init__.py to __init__.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/_ff.py to _ff.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/_ff_cross_references.py to _ff_cross_references.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/_pp_lbproc_pairs.py to _pp_lbproc_pairs.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/_pyke_rules/__init__.py to __init__.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/_structured_array_identification.py to _structured_array_identification.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/abf.py to abf.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/cf.py to cf.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/dot.py to dot.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/name.py to name.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/name_loaders.py to name_loaders.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/netcdf.py to netcdf.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/nimrod.py to nimrod.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/nimrod_load_rules.py to nimrod_load_rules.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/pp.py to pp.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/pp_load_rules.py to pp_load_rules.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/pp_save_rules.py to pp_save_rules.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/rules.py to rules.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um/__init__.py to __init__.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um/_fast_load.py to _fast_load.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um/_fast_load_structured_fields.py to _fast_load_structured_fields.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um/_ff_replacement.py to _ff_replacement.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um/_optimal_array_structuring.py to _optimal_array_structuring.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/fileformats/um_cf_map.py to um_cf_map.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/io/__init__.py to __init__.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/io/format_picker.py to format_picker.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/iterate.py to iterate.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/pandas.py to pandas.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/plot.py to plot.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/quickplot.py to quickplot.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/std_names.py to std_names.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/symbols.py to symbols.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/time.py to time.pyc
byte-compiling build/bdist.macosx-10.5-x86_64/egg/iris/util.py to util.pyc
creating build/bdist.macosx-10.5-x86_64/egg/EGG-INFO
copying lib/Iris.egg-info/PKG-INFO -> build/bdist.macosx-10.5-x86_64/egg/EGG-INFO
copying lib/Iris.egg-info/SOURCES.txt -> build/bdist.macosx-10.5-x86_64/egg/EGG-INFO
copying lib/Iris.egg-info/dependency_links.txt -> build/bdist.macosx-10.5-x86_64/egg/EGG-INFO
copying lib/Iris.egg-info/not-zip-safe -> build/bdist.macosx-10.5-x86_64/egg/EGG-INFO
copying lib/Iris.egg-info/pbr.json -> build/bdist.macosx-10.5-x86_64/egg/EGG-INFO
copying lib/Iris.egg-info/top_level.txt -> build/bdist.macosx-10.5-x86_64/egg/EGG-INFO
creating 'dist/Iris-2.0a0-py2.7.egg' and adding 'build/bdist.macosx-10.5-x86_64/egg' to it
removing 'build/bdist.macosx-10.5-x86_64/egg' (and everything under it)
Processing Iris-2.0a0-py2.7.egg
creating /Users/pelson/miniconda/envs/iris_dev/lib/python2.7/site-packages/Iris-2.0a0-py2.7.egg
Extracting Iris-2.0a0-py2.7.egg to /Users/pelson/miniconda/envs/iris_dev/lib/python2.7/site-packages
Adding Iris 2.0a0 to easy-install.pth file

Installed /Users/pelson/miniconda/envs/iris_dev/lib/python2.7/site-packages/Iris-2.0a0-py2.7.egg
Processing dependencies for Iris==2.0a0
Finished processing dependencies for Iris==2.0a0

To confirm:

(iris_dev) pelson@~/dev/scitools/iris> ll lib/iris/fileformats/_pyke_rules/com*
ls: lib/iris/fileformats/_pyke_rules/com*: No such file or directory
(iris_dev) pelson@~/dev/scitools/iris> ll /Users/pelson/miniconda/envs/iris_dev/lib/python2.7/site-packages/Iris-2.0a0-py2.7.egg/iris/fileformats/_pyke_rules/com*
ls: /Users/pelson/miniconda/envs/iris_dev/lib/python2.7/site-packages/Iris-2.0a0-py2.7.egg/iris/fileformats/_pyke_rules/com*: No such file or directory

Oh... well, at least I can reproduce the problem.... 😉

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

Woops. Looks like it is being put in the CWD:

(iris_dev) pelson@~/dev/scitools/iris> ll compiled_krb
total 224
-rw-r--r--  1 pelson  staff       0  2 Nov 12:08 __init__.py
-rw-r--r--  1 pelson  staff  110053  2 Nov 12:09 fc_rules_cf_fc.py
-rw-r--r--  1 pelson  staff     455  2 Nov 12:09 compiled_pyke_files.py

@bjlittle
Copy link
Member

bjlittle commented Nov 2, 2017

Yeah, the problem appears to be with the python setup.py install ... and it might also be linked to the fact that the tests are running against the installed version not the source version, so python setup.py pyke_rules is doing nothing.

@bjlittle
Copy link
Member

bjlittle commented Nov 2, 2017

yup, it puts it in the cwd!

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

Bing. Found it 🔥 🚒 - where pyke puts the compiled files depends on the cwd at import time, not at run time!

Fix incoming.

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

There are loads of tests being skipped in this PR ⚠️ looks like test data isn't being found.

Thanks for the pointer. This will be because our MANIFEST.in hasn't been tested before! 😱
I'll get on to fixing that now - I suspect we are simply missing the config file...

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

So - think I've found the issue. We try to put a config in build/lib-*/iris/etc/site.cfg, but really we should be putting it into the source and then installing it.

Latest commit does this.

@bjlittle
Copy link
Member

bjlittle commented Nov 2, 2017

Okay, I'll take a peek at your latest changes now that the tests are all passing ...

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

Tests still seem to be skipping. I'm digging now...

@bjlittle
Copy link
Member

bjlittle commented Nov 2, 2017

@pelson The site.cfg was included in the old setup.py explicitly under package_data ... shouldn't the MANIFEST.in now reflect this with recursive-include lib/iris/etc *.txt *.cfg ?

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

Just discovered that too. Thanks @bjlittle.

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

Let's see how that does... 😄

packages=find_package_tree('lib/iris', 'iris'),
package_dir={'': 'lib'},
package_data={
'iris': list(file_walk_relative('lib/iris/etc', remove='lib/iris/')) + \
list(file_walk_relative('lib/iris/tests/results',
Copy link
Member Author

Choose a reason for hiding this comment

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

Note that: before, we just put everything in lib/iris/tests/results. Now we are being explicit with a glob in MANIFEST. Not necessarily better or wrong - just different.

@bjlittle
Copy link
Member

bjlittle commented Nov 2, 2017

@pelson Infact, if that works then we should really change it to be recursive-include lib/iris/etc *.cfg and drop the *.txt as the lib/iris/etc/*.txt rules have now all been removed as a result of the v2.0.0 deprecation purge

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

Looks like it has done the trick. @dkillick, would you mind casting your eye over this and giving it a 👍 once happy.

I'll leave it to @bjlittle to do the actual merge.

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

if that works then we should really change it to be recursive-include lib/iris/etc *.cfg and drop the .txt as the lib/iris/etc/.txt rules have now all been removed

There are a bunch of palettes that are .txt too...

@bjlittle
Copy link
Member

bjlittle commented Nov 2, 2017

@pelson @dkillick LGTM 👍

@bjlittle
Copy link
Member

bjlittle commented Nov 2, 2017

btw diggin the branch name ... setup_love ❤️

@pelson
Copy link
Member Author

pelson commented Nov 2, 2017

OK. I've got some follow-on work for setup.py anyway, so let's go with this. @dkillick - if you have things you'd like me to change, I'd be more than happy to address in a follow-up PR.

@bjlittle - please merge when happy. 👍

@bjlittle bjlittle merged commit a408885 into SciTools:master Nov 2, 2017
@bjlittle
Copy link
Member

bjlittle commented Nov 2, 2017

Whoop! Awesome @pelson !

@pelson pelson deleted the setup_love branch November 2, 2017 16:19
@DPeterK
Copy link
Member

DPeterK commented Nov 2, 2017

@pelson @bjlittle to be clear, my "changes requested" status on this PR was only related to the tests being skipped. Seeing as that issue was fixed earlier, I'm completely happy this was merged 👍

DPeterK added a commit to DPeterK/iris that referenced this pull request Oct 22, 2018
* Fix coord_comparison when coords are the same object

* Added what's new items for SciTools#2730 and SciTools#2325. (SciTools#2852)

* Added what's new items for SciTools#2730 and SciTools#2325. [skip ci]

* Moved the bugfix docs to enhancement for the 3x speedup of area weights. [skip ci]

* Add unit test

* Add workaround

* Add test of current dask behaviour

* Ammended cube.var_name documentation. (SciTools#2874)

Ammended cube.var_name documentation to refer to it as NetCDF.

* Futures netcdf no unlimited (SciTools#2838)

* switched boolean operator and altered docstring

* raised error on future flag and tweaked functionality

* small change to deprecation warning message

* Code changes

* remake cdl results

* More CDL updates

(cherry picked from commit 47272b3)

* Review actions

* Use default Dask scheduler settings (SciTools#2879)

Disable dask.set_options call on _lazy_data import.

* Fix doctest failing due to change in 'netcdf_promote' future behaviour (SciTools#2883)

* Remove unneeded image repo url (SciTools#2885)

* Updated 2.0 release notes. (SciTools#2884)

* Add iris-grib as a testing dependency; Python 3 included.

* Fix requirements for iris_grib>=0.12, assuming it will have eccodes + thus work with Python 3

* Made the iris extensions not install by default.

* Reduced the number of processes used by default when testing.

* Set the documentation build to use viridis as the default colormap (rather than Jet as we are using matplotlib 1 still).

* Change behaviour of 'error' level (SciTools#2881)

* Change behaviour of 'error' level

* Change Future netcdf_no_unlimited tests

* Fix tests testing the wrong thing

* Dask processing options docs updates

* Added some what's new information about SciTools#2435 and SciTools#2810.

* Use the cube dimension order to determine the plot axes.

* Small update to experimental-FF whatsnew statement (SciTools#2898)

* Move some whatsnew items, remove spurious list

* Move nc-no-unlim text to whatsnew

* Fill value handling on save notes

* Netcdf scalar cube loading bugfix

Previously Iris used to simply ignore scalar cubes.

* Corrected usage context in description of PointInCell regrid scheme. (SciTools#2735)

* Re-worked setup.py to avoid the need for separate/non-standard build commands (SciTools#2891)

Re-worked setup.py to avoid the need for separate/non-standard build commands.

* Missing data whitepaper (SciTools#2906)

* Ensure lon/lat return order is consistent throughout (SciTools#2238)

* Updated to v46 of the CF standard-name table. (SciTools#2908)

* Updated to v46 of the CF standard-name table.

* Updated the area-type table to v6.

* Use viridis cmap for doc images (SciTools#2909)

* Stickler config (SciTools#2896)

* Added a flake8 config.

* Added a stickler-ci config.

* Handled the recent update to conda-forge for testing, perhaps relating to GEOS update. (SciTools#2912)

* Bumped master to the v2.1 stream. (SciTools#2910)

* Stickler config (SciTools#2896)

* Added a flake8 config.

* Added a stickler-ci config.

* Improved the way requirements are handled, ensuring that pip gets all the information it needs. (SciTools#2890)

Improved the way requirements are handled, ensuring that pip gets all the information it needs.

* Further docs refinement for v2.0.0 (SciTools#2916)

Some minor documentation tweaks for v2.0.0

* Remove obsolete reference from Userguide. (SciTools#2915)

* Reverse 2878 (SciTools#2926)

* Remove dask issue workaround; wrap computed MaskedConstant as array

* Reduce exception message for loading missing files. (SciTools#2925)

* reduce error message

* update file not found tests

* clearer message

* Allow missing value (SciTools#2892)

* Allow missing_value as a user set attribute

This allows the user to set missing_value as an attribute on a
cube while ensuring that it is saved as local attribute in the
netcdf file.

* Added the what's new and updated the copyright years for SciTools#2892.

* Fix some header dates.

* Add note on using intersection (SciTools#2931)

* CML changes for cf_units v1.2.0 (SciTools#2936)

* CML changes for cf-units v1.2.0
* Add whatsnew entry

* [DOC]: Update userguide note on intersection (SciTools#2933)

* Update userguide note on intersection

* Update with concrete boundary examples

* Prepare master for v2.0.x branch (SciTools#2934)

* Converted the contributions into the whatsnew.

* Updated to a dev version string.

* Tweaked what's new, bumped version string, and updated the MANIFEST for pypi.

* Perserve dtype of source cube with area weighted regridder (SciTools#2203)

Perserve dtype of source cube with area weighted regridder & add what's new

* Update license headers to handle the merge of a PR from 2017 in 2018 (SciTools#2948)

* DOC: lazy data docstring made clearer (SciTools#2947)

* DOC: lazy data docstring made clearer

* Clarify "view"

* Remove gdal from 'all' to 'extensions' depedency group.

* Remove gdal from 'all' to 'extensions' depedency group.

* DOC: lazy data docstring made clearer (SciTools#2947)

* DOC: lazy data docstring made clearer

* Clarify "view"

* No docs are better than wrong docs on dask

* Add a general zenodo link to the readme. (SciTools#2955)

* Improved the pip installability of scitools-iris. (SciTools#2956)

* Release of iris v2.0.0 🎉

* Merge v2.0.x into master (SciTools#2957)

* Tweaked what's new, bumped version string, and updated the MANIFEST for pypi.

* Remove gdal from 'all' to 'extensions' depedency group.

* DOC: lazy data docstring made clearer (SciTools#2947)

* DOC: lazy data docstring made clearer

* Clarify "view"

* No docs are better than wrong docs on dask

* Add a general zenodo link to the readme. (SciTools#2955)

* Improved the pip installability of scitools-iris. (SciTools#2956)

* Release of iris v2.0.0 🎉

* Move v2.0.x branch into development mode.

* Fix the documentation building for latest version of sphinx. (SciTools#2958)

* Remove FutureWarning from use of np.issubdtype(obj, np.str) (SciTools#2954)

* Add cube co-realisation. (SciTools#2967)

* Fix for changed API of cartopy.crs.Stereographic (SciTools#2971)

* Fix for changed API of cartopy.crs.Stereographic; fixes tests.test_coordsystem.

* License header fix.

* remove site.cfg exclude from manifest.in (SciTools#2978)

* Save calendar attribute for cube data (SciTools#2984)

* Fix bug with aux coords with scalefactor/add_offset (SciTools#2975)

Fix bug with aux coords with scalefactor/add_offset

* Rename to correct package name

* Fix imagehash hex_to_hash (SciTools#2989)

* Fix imagehash hex_to_hash

* expose hamming distance vector

* fix idiff

* update imagerepo

* fix repo hashes (bjlittle)

* fix repo hashed (scitools)

* fix test_image_json

* test_pearsonr: use compatible cubes for testing compatible cubes (SciTools#2960)

Pearsonr test using compatible cubes

* Use unittest.mock for Python 3 (SciTools#3003)

* reflect new latitude guess_bounds behaviour (SciTools#3006)

* Pin Dask to >=0.17.1 (SciTools#2965)

* Fill a usability gap in iris.analysis.Trajectory (SciTools#2770)

* Fill a usability hole in Trajectory

* Remove iris.experimental.um module (SciTools#2781)

* Remove iris.experimental.um module

* Replace use of sphinx's status_iterator function, which has moved

* Lazy unit conversions for cube and coord data. (SciTools#2964)

* Gracefully handle long time intervals (SciTools#2354)

Gracefully handle long time intervals (months & years) when plotting

* Prevent creation of invalid CF variable names. (SciTools#3009)

Prevent creation of invalid CF variable names.

* Add stash check to name() (SciTools#2930)

Try the STASH attribute when checking for possible names (as is already done in the summary method)

* Attempts to fix docs-build error reporting. (SciTools#2983)

Remove final semicolon to report docs-build error.

* Phenomenon translation updates (SciTools#3011)

* Netcdftime dep (SciTools#3017)

Pin to netcdf4 1.3 or below while we await netdftime updates
Correct deprecated pandas use in v0.23

* add 'axes' kwarg to _label when called from contourf

* Replace iris.co_realise_cubes with CubeList.realise_data. (SciTools#3013)

* Replace iris.co_realise_cubes with CubeList.realise_data.

* Avoid exposing lazy-data functions in iris.cube and iris.coord modules.

* Tidy lazy_data imports in cube + coords modules.

* Amend var_name documentation (SciTools#3020)

Amend documentation to be explicit that var_name is a netCDF quantity, not necessarily a CF one.

* Updated tests for cf_units 2 (SciTools#3023)

Updated tests for cf_units>=2

This change:
 * Removes the redundant ``iris/tests/test_unit.py`` tests.
   They are all migrated to cf_units.
 * Makes use of CALENDAR_GREGORIAN, rather than CALENDAR_STANDARD.
   These calendars are implemented as aliases in cf_units 2, and the
   "STANDARD" concept is not preserved/round-tripped.

Added a what's new to help reduce possible impact for users.

* Use ConfigParser for py>=3.2 (SciTools#3025)

* WIP: Unpin mpl (SciTools#3019)

* unpin mpl

* Add _repr_html_ for Iris cubes (SciTools#2918)

Add cube _repr_html_ functionality

* Partial collapse of multi-dimensional coordinates (SciTools#3028)

Adding support for partial collapse of multi-dimensional coordinates

* Tidy up the root of the repository for v2.1 (SciTools#3034)

A bunch of miscellaneous changes in preparation for the v2.1 release:

 * Move CONTRIBUTING.md to a .github/ folder.
   See also: https://help.github.com/articles/setting-guidelines-for-repository-contributors/
 * Updated the .gitignore to reflect what gets produce in day-to-day iris development
 * Reduced the amount of redundancy in INSTALL. It now points to the requirements/ directory
   which is what we actually test.
 * Updated minimum dependencies in requirements (because that is all we test):
    * Numpy>=1.14
    * Matplotlib>=2
    * cf_units>=2

* Remove the CODING matrix item. (SciTools#3036)

* Add Albers Equal Area Projection and some test as per SciTools#2496 (SciTools#2943)

Add Albers Equal Area Projection and NetCDF rules to handle it

* Improve the appeal of the landing pages (docs and README) (SciTools#3040)

* Update the Iris README markdown to be consistent with other SciTools projects.
* Gave the package a description (for pypi).
* Minor spruce of the Iris docs layout to include the tagline and the forkme button

* Use the correct pypi name for nc-time-axis. (SciTools#3039)

* Use cftime instead of netcdftime (SciTools#3016)

* use cftime instead of netcdftime

* fix the docs too

* fix license year

* review actions

* simplify test_pandas

* what's new

* remove cf_units check

* Fixed the intermittent test in SciTools#3035. (SciTools#3037)

* Fixed the intermittent test in SciTools#3035.

The problem was that iris.util.format_array was stateful (via np.set_printoptions).

* Fix stateful tests (SciTools#26)

* Add dask-array as a requirement when pip installing. (SciTools#3033)

* Unpin netcdf4 (SciTools#3031)

* unpin netcdf4

* adapt for netcdf4 >=1.4

* fix userguide doctests

* Metarelate updates in the UM 2 CF mapping (SciTools#3043)

* Updated the README, and copied that over to the iris docs homepage. (SciTools#3045)

* Added the what's new for iris 2.1 (SciTools#3044)

Added the what's new for iris 2.1

* Updated the cf-standard names to v54. (SciTools#3046)

Achieved with:

  $ wget http://cfconventions.org/Data/cf-standard-names/54/src/cf-standard-name-table.xml -O  etc/cf-standard-name-table.xml
  ...
  --2018-06-02 06:32:17--  http://cfconventions.org/Data/cf-standard-names/54/src/cf-standard-name-table.xml
  ...

* iris.quickplot: Ensure labels and plot use the same axes

Allow iris.quickplot to accept an axes kwarg to which title and axes labels can be attached.
This is done without using the matplotlib state machine.
Closes SciTools#2946

* sticklering

* Full-featured Mercator coord system (SciTools#3041)

Add ``standard_parallel`` to the Mercator Coord System

* Updated the branding and execution of Iris docs (SciTools#3050)

* Updated the branding and execution of Iris

This includes:

 * removing the "easy-to-use" statement in Iris' strapline. Let's let users be the judge of that.
 * improved the styling of the homepage, including re-instating the search bar.
 * Added a what's new for SciTools#3010.
 * Added a extlinks section for convenient linking to github issues with :issue:`number` and :pr:`number`.

* Added a favicon for the docs.

* Improve strapline style, content (SciTools#27)

* Further improvements to Iris docs

* Improved font (noto-sans)
* Removed old CSS
* Fixed a few what's new entries

* [DOC] Iris Introduction updates (SciTools#3052)

Update the introduction of Iris content.

* Updated to v2.1.0. (SciTools#3051)

* Move into development mode for v2.1.1

* Move into development mode for v2.2.0

* remove first 'and' from tagline to make it read easier

* Notebook repr whatsnew update

* remove first 'and' from tagline to make it read easier

* minor requirements tidy

* http -> https for copybutton.js (SciTools#3066)

* Explain use of saver='string' in iris.save (SciTools#3062)

* Fix reStructuredText warnings in documentation (SciTools#3069)

* Add information about comparing STASH objects with strings (SciTools#3072)

* Doc: Fallback to no syntax hightlighting without warning. (SciTools#3071)

Fixes:
iris/docs/iris/src/developers_guide/gitwash/development_workflow.rst:317: WARNING: Could not lex literal_block as "python". Highlighting skipped.

http://www.sphinx-doc.org/en/stable/config.html#confval-highlight_language

* Quick fix to get tests passing by pinning dask version (SciTools#3086)

* ENH: Working zonal mean linear regridding for circular sources or with use of extrapolation (SciTools#3085)

* Working zonal mean from circular/extrapolated source to target

* MAINT: Refactor of zonal mean testing

* MAINT: Documentation changes from review

* Avoid pandas deprecation warning. (SciTools#3079)

Avoid pandas deprecation warning.

This also simplifies code by being explicit about usage of "base" and "values"
for numpy and pandas objects, and removes legacy code that may no longer be valid.

* Workaround for dask array copy bug (SciTools#3088)

* add contact options to README

* Add stash mapping changes to v2.1.0 changelog

* Pin Dask for avoid 0.18.2 bug with masked arrays.

* Tiny fix for dask, Python3 only?

* Disable doctests for Python 2.

* Ignore warnings and update array printouts.

* Better way to disable Python2 doctests.

* Support plotting 2D bounded coords

* Add gridcell_angles and rotate_grid_vectors to iris.analysis.cartography, with tests: INCOMPLETE WIP

* Roughly working, snapshotted with complex test plot code, to be reduced.

* Small improvements.

* First working quiver+streamplot.

* Handle custom coords correctly

* some words for docs, WIP probably

* suggested tweaks and corrections

* Update docs to included 2.2 versions (SciTools#3110)

* Provide a test skipper for 2d coords WIP. (SciTools#3099)

* Change version number (SciTools#3118)

* re-added bounds definition for contiguity check, removed unnecessary test

* Ensure Sphinx autodocs for grid_angles routines.

* Codestyle fixes.

* Whatsnew entries for 2d vector support.

* Pin Dask to avoid 0.18.2 bug with masked arrays. (SciTools#3127)

* Put orca_util routines in subpackage of iris.test.stock, to get existing iris.tests.unit.plot.test_2d_coords working.

* Disable broken misused testcode in test_gridcell_angles.

* Ditch test_gridcell_angles, none of it is functional.

* Further style fixes.

* Skip tests using iris-test-data, for Travis TEST_MINIMAL phases.

* Codestyle fix (though this code obsolete anyway).

* Fix unused imports.

* Made-up test cube replaces use of iris-test-data.

* Renamed keyword; improved docstring.

* Change 'co' to 'coord' for clarity.

* Review changes.

* Update pp save rules to handle time means (SciTools#3132)

* Vector plots 2 (SciTools#3120)

* Small improvements; first sensible tests.

* Enhanced testing; better checking and crs awareness in grid_angles routine.

* Remove crud from test_gridcell_angles.

* Use degree units for everything in _grid_angles.

* Make assertArrayAllClose print details when it fails.

* Rework and extend testing for gridcell_angles.

* Fix assertArrayAllClose; remove debug code from test_gridcell_angles.

* Remove obsolete assignments.

* Remove obsolete code.

* Small comment improvements.

* Attempt to clarify docstrings of low-level routines.

* More tests, and some functional fixes.

* Codestyle fixes.

* Review changes + fixes.

* Avoid using sample data.

* Temporary pin to avoid problems caused by Proj4 v5.1. (SciTools#3150)

* Extending ORCA blockplotting (w/ tests) (SciTools#3135)

* Tests for rotate_grid_vectors (SciTools#3148)

* Tests for rotate_grid_vectors.

* Small fix to assertArrayAllClose for values near 0.

* Small tweaks.

* Fix test method.

* Fix 1 test for 'equal_nans' no longer the default.

* Review changes.

* Remove 'skip_2d' test decorator. (SciTools#3156)

* Add integration graphics tests for pcolormesh with 2d coords (SciTools#3149)

* Vector plots 4 (SciTools#3158)

* Fix contig_ tolerance kwarg bug (SciTools#3162)

* Add simple lazy aggregations

* Lazy SUM and COUNT, tests improved

* Add tests for MAX and MIN

* Update tests for STD_DEV

* Use NetCDF variable's chunks on load (SciTools#3131)

Preserve NetCDF chunks on dataset load

* Iteration and less duplication

* Attempt to fix Matplotlib issue by resticting to 2.x

* Non-test review actions

* Make COUNT tests truer unit tests

* Convert MAX and MIN tests to truer unit tests

* Convert COUNT and SUM agg tests to truer unit tests

* Tests for new _lazy_data function

* Fix for netCDF4 1.4 behaviour change. (SciTools#3177)

* Improve gracefully filling warning (SciTools#3171)

* Realise that running the tests is simpler than I thought

* Make Gracefully warning only appear when filling is required

* Add tests of warnings

* Get rid of install changes, they are in SciTools#3170

* Update after review

* Add whatsnew entry

* Minor clarification to entry via a little more punctuation

* Revert nc vars masking fix (temporarily). (SciTools#3178)

* fix for pandas column object bug (SciTools#3176)

* turn columns object into pandas array, plus test

included cml this time

* made things the way pandas like it; bambooish

* regenerated cml to match output

* Update module headers and installation instructions (SciTools#3170)

* Update module headers and installation instructions

* Realise that running the tests is simpler than I thought

* Update install instructions for developers

* Update INSTALL to be consistent

* Correct some failing tests

* Update tests.rst (SciTools#3082)

Added one line on how to test. This is mentioned in the Iris Check List in pulls.rst list, but would be good to have it here as well (useful for new contributors like me).

* Add link to developer guide. (SciTools#3093)

* Combine identical test routines for pcolor + pcolormesh.

* Test 'contiguity_tolerance' use in iris.plot.pcolor and pcolormesh.

* Unpin dask

* Handle printing bounds of long time interval coords (SciTools#3140)

* Handle printing time bounds

* Whatsnew, whitespace fix for test result

* iris.util.reverse on cubes (SciTools#3155)

* make cube reversing official

* review: test conventions, etc.

* review: enable coord specification

* add whatsnew

* review: AssertRaises --> AssertRaisesRegexp

* cube error handling

* Improved Aux factory error handling: better message, delivered earlier (SciTools#3182)

* Tests for expected behaviour

* Raise error if aux factory relies on a coordinate external to cube

* Include coordinate name in error message

* Don't check whether dependencies that are "None" are in the coords.

* Review changes: check cube name in error and variable rename

* Truncated variable for flake8

* Correct cube collapse code

* Provide info on pp-field indices in the file for structured um loads. (SciTools#2977)

* Field locations for structured um loads.

* Remove unused import.

* Fix test for new implementation.

* Added whatsnew.

* Review changes.

* simplify dev guide

* Integration test for iris.plot.contour with 2d coords. (SciTools#3189)

* Integration test for iris.plot.contour with 2d coords.

* Review changes.

* pinned numpy to not 1.15.2 in core requirements

* Public contiguity checking (SciTools#3144)

:champagne: :1st_place_medal: for sticking with it @corinnebosley

* Populate whatsnew 2.2 (SciTools#3192)

* started adding entries to whatsnew

* more updates to whatsnew

* first complete draft of 2.2 whatsnew

* some small corrections

* made corrections suggested in review

* Update version str

* Update CF standard name table to v59

* Fix docstring re structured text warnings (SciTools#3073) (SciTools#3197)

* updated version string to 2.3.0dev0

* add contact options to README

removed gitter from contact list

* Add stash mapping changes to v2.1.0 changelog

replaced list with link of stash mappings

* expanded name of dev group

* added an n for better flow

* Fix broken link to dask docs (SciTools#3204)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot install iris for Python3.6
3 participants