Skip to content

Commit

Permalink
Update (#13)
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
DPeterK authored Oct 22, 2018
1 parent e74cb53 commit 29742b7
Show file tree
Hide file tree
Showing 2,003 changed files with 132,118 additions and 59,326 deletions.
File renamed without changes.
1 change: 1 addition & 0 deletions .github/deploy_key.scitools-docs.enc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gAAAAABZSMeGIlHxHu4oCV_h8shbCRf1qJYoLO9Z0q9uKRDTlytoigzlvfxhN-9WMjc3Js1f1Zg55PfEpTOpL82p6QHF-gqW0k0qGjanO3lnQzM6EzIu3KyJPrVrL-O6edwoPMYKqwsNO3VQHNuEspsFKY0TbjnTPHc45SPU5LjEGX4c_SADSDcLDJm2rbrU2eVkT-gFHy_-ZzK0Di83WlDc79YzIkVe5BAn5PbWv3O9BROR4fJzecbjmWRT_rp1cqI_gaUpVcwTdRK3II9YnazBtW4h2WbCeTcySLD7N4o9K0P71SR6gG_XFbpML3Haf5IUdRi0qPBuvJ_4YVnnuJo6mhiIOJfUEcNj_bbLOYVzPmKyQMHvrPf_lK5JhdX6MUvqluhqHuc0i_z_j1O2y32lB7b1iiY6eE_BsNlXJHlOX1GiXkX0nZLI48p-D22jya44WshWSnVcoalcCDkdbvdFbpOscwXDR3nB-PCOmRUF_d1BlMbp1if-VP0yt3tJ_5yyCrqSRWwFusaibQTF6yoImetl7Am95hh2FjFDNkalHqtarnUv86w-26v1ukcTIjJ0iHzNbCK1m0VMkvE6uDeqRgIZnVKON5cesmM3YbulRrHpaOiSly_sMhLhfg5jTxAuOa319AQGoHEOcRLRUYdw2TQkDEiHGiUh_U4-nC7GTGDGcXyeBIa4ciuC2Qi0QXf9qyEGoIRcU8BP34LDNdtovJoZOBDzhr5Ajnu7yA3GB3TD_kiZrgm6agFuu7a51OMfjezhwGzUJ4X-empPctwm9woOJmPCTFqCvxB2VwVV0L6yngsTooyAHCi5st_AG-p5FIT3VZGx7EgCd68ze9XlRoACoe9XOdSFklbaSMGRbJlvKCPAA0zj4__PfIhlD8Cxwwjq_VXlSr_QxygIGZJlhkT46P9TroolgdipaBp1aQ3_PKHfgw5Y9ZqBKCZF5DOJejqUbfVKUp2JdqoX3yQBD0ByQFdfCuLvoiYcM2ofKdIMvel3Jwn0Nx4NYR2qg3h7FYti0jdrNlC89gnL4tKsf0DAGxZ1UYmqQMWJ3-GKCKrlKyeaHYB2djPRGP8VeoRZh_UorSNHU56KSztK_hTP6P0nFymRJRUSRBMKTaTfJf1aBlk9zJHSe9hOKwxyUNkwcTftGn5P0WNcnaTk3ecTVe-1QJKbPWwMBDzqQtTCsCizgN4UdQsmy4iMYq-LT2TC-JXXo0CPTNDybUj92wSa7KeKTvKnbN8DMZbGRdgy5BOSGw4hMIoIFSB-6tnBIvTntNfMT9ac9e9jKm47Q4qXpaeF3AsvBqxkMRQLaYVppPng6cA49VjJQDZ0gTdPKSSKZkApfeeQL0LLCGwzQ4C52TWK2NJSQ3pvRYI1F0taDQWopIiwFfox-OSYnOJECHkHjxaxhHQzVb3w47xKKZNXbLb-LV7QI-kGuKLfoqO1lq94cw1H-EVrXaGJcDDLjK2jRgdVfDyPsHMcW1oUDJqu8gQ6fCXYPbqJzdmFNFsc1hywHWCU7crV61D2QubwzbLRnP8053MvsMnbdhWtwocTlvvdG-qW6CiEA9Eanfpf0RW1W9oh6yQJ__0vS9UWswqq5ahkkpHY9LTE0US4L3xbFOrq7HgbA2jelTdPVfxo3BfUHuL8oKpFDTzgZi07gNmkhIZfpuXj2KFnm9XM31AsY6V2rXL0xSx-9rvi4FP0LK6V5vQ8OKI8aRPCDyzLUv2xnayMW4yaYg3GHD5yo7pIOswKc6GOEmetPnay3j0dVN3hfpkpfJWhss3vjZ2Zl0NmjJ7OuS25tjUGLy82A1yFSpL8mKRkHZJuMDZbd_Or6gaPVoVT_Otbkh-6pMZuDeOHOUfgey0Z374jCjRpyQ9k-Fpw8ykow8iIIQ088kC5CeQy6jRhD7mO3iR4-U1XKDJQNlNg1z_JYyDrwykp7FFN2sQn7RRYHIXx2iMrEDXdrdTrujMFN6omC13yDuXJukAgZb6zBBUTlonxRUBjUJWt2P-1sRRTsG8mr9EaE5K-xhR5Ust_37L3svNQ0vwLtPLIpWGZHhD8P_dYNR2RL4679xyzI8A7wLY82wFBHrcghAd4UtLJH9ul6IuS_CaVo-gbfowNRaQ0Zw7WHZGIXpZWEx1_zck6qDEaCY8TpQeciBWpH5uJDSYqdLdMwigdQEGzAJ1DHSWsyTrmOR7Lhwi9WqOzfWe4ahxAkAUH_Jdr_i-nGfl_x3OgQdHM7jWVMXDcXEmR0bkw-s0EKXCn20q2bxDkm5SUWkYtWAZ2aZRgo4wHOqGBcP99xZ25mq9uxtNOkLBF81lnVbn_4BAZBNnnKwwj4SafeIW4KR1ZOpnEI47sGUR6NhEk9VtJsv0zeZIv8VjRbNLh3QCxkNMue60SjJ48kjotZSX1RQJN0xwPftiABBf8MX9tyZe8emQvPeIcdQTSQPnYEUx22xZGeeJTNrZ9soQyP6mrkkRihp6o9tG7HT9QEVLGM19wAigwAAMMXGqdGzWwpar30JtJU94gAmIlwFUJqeO_fdJKFspnUyJ6gt5_oHsKNEV7Uz5EJwGpa94tlPJXjvZpu-wWQfu8U0trTU2mTCA0bmZIDID-Xk4vCW_SD4OVnsvWyga4QHSg3AqVTjnjlapAjsYcFjiOo2C_U3besloprpyuAwpTdn7zdfMHIJO0ckBFnXlk8XB3kT0YGrCpBvW6gYMXlnePVcr3wJehCvMg1Q9Dc5fVQUqt65zcjbgiudfzFGtTe9T4f1IttoAtrJgTN4W1mtbZzSK864I_ngaX5YWgZSinjkbocCCFEJDcbiXMnV7OWOZefqW6VZu4BZKEKlN9k2kH3UCECCK3uRAQIPn_48DgaVnAff2-fMADltiosSPJ_a3057acJP0cf-1QsJuV7r3zdzL3shgrMRjpSsSTCYdMhZ6disFGcJg7hJJvtH1FieZ76jps5FYi5lE8Ua9yBKlG4dCGuUBnikvpfy2FLMLFNn-iXLflu2oiBbcLvn_ReZUnFIR6KgGRN8xKEBaXATQVtb2E678GtQptK8PHP2DoAtbsIXUDn60YH04D9pEck8NnmWYAz7sWbiL6OKdaO7jQep4mt3CgkyFC0NCKP9zCbVNtmfHRVmHtckjgfHF-tK_v59KeAuwWPtm7ow2BjynAK42IGR9nWtQFRUZIboaND8UF76YGKFF7kOf_XTvoNrVTCRkD6b8KJy2IFfdoHP6WET9QLvwDSXgYLPlCX9z7aQ_lc57u5d_dGO-7NZ_Qbs69ByyIvQoztVBjw6fa7EzSwccqPfMQL_fiecNCng-r4gHaH6TlgSbfqQOISHxTtvmbym1no560ZsHfnQfuL6BCI8s6OoygxhOnQhaDqyOUVBut_x3VR_DKFMyUazXYNgLbRsdITaAvR-0gIx5TAX9n3A4HwHuiBZCtwRYaiJnW8FX9lk1Y_g5UHL2OC3rsNFui3aBLzAFhx58lALxnxhlUItuHHK9BgexnR2yCj2nOWLoWQzfFaf2_fpjEh_QBHTqUxdQZ8ighg_8lh6hmLbW4PcUxKX71RFmikLyS3-idlzsiEomNlPNaVllRF21vE6dR-nZ6xsxzTvNB4wumP2irQ9mFBTN1WpiLMyNoEEucA2I848YHUfkZrjTG_dcCQNp7H_2gKdIsZ135lUEG6lYfhLMHTmP5uYxxx3Pipjp6wF2GFCsZPIlIPsgrhbSxqkWg1EOViHtpw6ypFKn7wQHHfnrnHkFWnrKbMARVBjJUB-FhK4b6qLU_k_MTMipemneMUFXlj3EkEhKM18MIHGkIOkwG5QtPYcjUAf_2sZlxSMVnh6sQ8kVwF6lfk_l8jhoO93HUTntZUSv7GrE3s80yJgII4Qw37AdgcJiAkoPn1-17HfSsAy6uRh5-OvrCtkDqQxfuJSyn_4pRMh6hZT7N9pI5limMXXn2nHnxU93UT3qU-smA8q0ECfvK3JwoaYy_llSx0wSBvpmxjLQ302sFYM5FVZ9zRbHuLCCZShVopiyMDLHVJe_1g9Ou1KL-h6RVZgg3Ttyb5m2KDfoHEVLeZkW81YLCsyo7uNb6SVRM-615TIVGT6Eq7oJ6wO2LMDKjEpHKFiOFpY2fpR8noM81UqgLddYfl_lei7RVjaNO98otqE4iSNtpgJgyhAx4CdYm__yQRSXhckR4K7yAhM9Kh5BLbQQnf2_0WS1sWTmNMZZNMfOSqmTCRVwcYvg4TDGOA-vZARbZW1M7npVMldV_SbvgcEZD6InY9c40eheRqS0YD2W2HEZIiNeLRw0y5WBcYuJIpXhI3ViTXx-frJnv0Mo9uwmuLbJmWFcn6RdIVcU68_oPZZlZD4Vm7SjikbuZKF1BF3lXamTTDIBcWiDLwuNDv2lUkURDCWa5WJsfUCfTAJ6PTe8=
20 changes: 19 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
*.py[co]

# Environment file which should be autogenerated
*conda_requirements.txt*

# Packages
*.egg
*.egg?
*.egg-info
dist
build
Expand All @@ -15,10 +18,12 @@ develop-eggs

# Installer logs
pip-log.txt
pip-cache

# Unit test / coverage reports
.coverage
.tox
.pytest_cache

#Translations
*.mo
Expand All @@ -31,17 +36,30 @@ lib/iris/std_names.py

# Iris test result files
lib/iris/tests/result_image_comparison/
iris_image_test_output/
*.ESMF_LogFile

# Iris test lock file
lib/iris/tests/results/imagerepo.lock

# Pydev/Eclipse files
.project
.pydevproject
.settings

# PyCharm files
/.idea
*.cover

# Auto generated documentation files
docs/iris/src/_static/random_image.js
docs/iris/src/_templates/gallery.html
docs/iris/src/examples/
docs/iris/src/iris/
docs/iris/src/matplotlibrc

# Example test results
docs/iris/iris_image_test_output/

# Created by editiors
*~
Expand Down
13 changes: 13 additions & 0 deletions .mailmap
6 changes: 6 additions & 0 deletions .stickler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
linters:
flake8:

files:
ignore:
- 'lib/iris/fileformats/um_cf_map.py'
272 changes: 148 additions & 124 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,143 +1,167 @@
#
# Based on pelson's travis work for cartopy.
#
# Please update the cartopy, test data, and sample data git references below if appropriate.
# Please update the test data git references below if appropriate.
#
# Note: Contrary to the travis documentation,
# http://about.travis-ci.org/docs/user/languages/python/#Travis-CI-Uses-Isolated-virtualenvs
# we will use the system python because it takes too long to install scipy from source.
#
# we will use conda to give us a much faster setup time.


language: python
python:
- 2.7
- 3.6
sudo: false

env:
matrix:
- TEST_TARGET=default TEST_MINIMAL=true
- TEST_TARGET=default
- TEST_TARGET=example
- TEST_TARGET=doctest

global:
# The decryption key for the encrypted .github/deploy_key.scitools-docs.enc.
- secure: "N9/qBUT5CqfC7KQBDy5mIWZcGNuUJk3e/qmKJpotWYV+zwOI4GghJsRce6nFnlRiwl65l5oBEcvf3+sBvUfbZqh7U0MdHpw2tHhr2FSCmMB3bkvARZblh9M37f4da9G9VmRkqnyBM5G5TImXtoq4dusvNWKvLW0qETciaipq7ws="

git:
depth: 0
# We need a deep clone so that we can compute the age of the files using their git history.
depth: 10000

install:

- export BIGGUS_REF="da8f19f197adff77e8071b0e04269c8b888a1fbf"
- export BIGGUS_SUFFIX=$(echo "${BIGGUS_REF}" | sed "s/^v//")

- export CARTOPY_REF="v0.10.0"
- export CARTOPY_SUFFIX=$(echo "${CARTOPY_REF}" | sed "s/^v//")

- export IRIS_TEST_DATA_REF="3378fe68c00ca7f31895ab6630a59a39ccef94e3"
- export IRIS_TEST_DATA_SUFFIX=$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//")

- export IRIS_SAMPLE_DATA_REF="2e7c73504e3d675d97dc8a2c2939f9fd2cfe51f1"
- export IRIS_SAMPLE_DATA_SUFFIX=$(echo "${IRIS_SAMPLE_DATA_REF}" | sed "s/^v//")

# Switch off virtualenv so we can use apt-get for Python packages.
- deactivate

# add repo
- ./.travis_no_output sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3E5C1192
- ./.travis_no_output sudo add-apt-repository -y ppa:ubuntugis/ppa
# access to scipy 0.12.0 https://launchpad.net/~pylab/+archive/stable
- sudo add-apt-repository -y ppa:pylab/stable
- ./.travis_no_output sudo apt-get update

# install deps
- ./.travis_no_output sudo apt-get install python-scipy cython python-pip
- ./.travis_no_output sudo /usr/bin/pip install numpy==1.7.2
- ./.travis_no_output sudo /usr/bin/pip install --use-mirrors shapely nose
- ./.travis_no_output sudo /usr/bin/pip install --use-mirrors pyshp pep8 mock
- ./.travis_no_output sudo /usr/bin/pip install --use-mirrors setuptools
- ./.travis_no_output sudo /usr/bin/pip install matplotlib==1.3.1
- ./.travis_no_output sudo apt-get install libgeos-dev libproj-dev
- ./.travis_no_output sudo apt-get install libudunits2-dev libhdf5-serial-dev netcdf-bin libnetcdf-dev
- ./.travis_no_output sudo apt-get install make unzip python-sphinx graphviz
- ./.travis_no_output sudo /usr/bin/pip install netCDF4==1.0.2
- ./.travis_no_output sudo /usr/bin/pip install pyke
- ./.travis_no_output sudo /usr/bin/pip install pandas==0.12.0
- ./.travis_no_output sudo apt-get install openjdk-7-jre
- sudo apt-get install python-gdal
- export LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server:$LD_LIBRARY_PATH

# cfchecker
- ./.travis_no_output sudo /usr/bin/pip install cdat-lite
# cfchecker via pip normally works, but we've found the pip interface to fail intermittently,
# therefore we specify the full download url.
# - ./.travis_no_output sudo /usr/bin/pip install cfchecker
- ./.travis_no_output sudo /usr/bin/pip install https://pypi.python.org/packages/source/c/cfchecker/cfchecker-2.0.3.tar.gz#md5=54e780e8688ac743d1e21448a3901061

- echo '#!/usr/bin/env sh' > cfchecker
- echo "cfchecks -s `pwd`/etc/cf-standard-name-table.xml -a `pwd`/etc/area-type-table.xml -u /usr/share/xml/udunits/udunits2.xml \$1" >> cfchecker
- ./.travis_no_output sudo cp cfchecker /usr/local/bin/cfchecker
- ./.travis_no_output sudo chmod a+x /usr/local/bin/cfchecker

# grib api
- ./.travis_no_output sudo apt-get install libjasper-dev
- ./.travis_no_output sudo apt-get build-dep libgrib-api-1.9.9 libgrib-api-dev libgrib-api-tools
- ./.travis_no_output wget https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.9.16.tar.gz --no-check-certificate
- ./.travis_no_output tar -xvf grib_api-1.9.16.tar.gz
- cd grib_api-1.9.16/
- ../.travis_no_output CFLAGS="-fPIC" ./configure --with-jasper=/usr/local/lib --disable-fortran --enable-python
- ../.travis_no_output make
- ../.travis_no_output sudo make install
- cd python
- ../../.travis_no_output sudo /usr/bin/python setup.py install
- cd ../..

# biggus
- ./.travis_no_output wget -O biggus.zip https://github.com/SciTools/biggus/archive/${BIGGUS_REF}.zip
- ./.travis_no_output unzip -q biggus.zip
- ln -s $(pwd)/biggus-${BIGGUS_SUFFIX} biggus
- cd biggus
- ../.travis_no_output /usr/bin/python setup.py install --user
- cd ..

# cartopy
- ./.travis_no_output wget -O cartopy.zip https://github.com/SciTools/cartopy/archive/${CARTOPY_REF}.zip
- ./.travis_no_output unzip -q cartopy.zip
- ln -s $(pwd)/cartopy-${CARTOPY_SUFFIX} cartopy
- cd cartopy
- ../.travis_no_output /usr/bin/python setup.py install --user
- cd ..
- >
export IRIS_TEST_DATA_REF="2f3a6bcf25f81bd152b3d66223394074c9069a96";
export IRIS_TEST_DATA_SUFFIX=$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//");
# Cut short doctest phase under Python 2 : now only supports Python 3
# SEE : https://github.com/SciTools/iris/pull/3134
# ------------
- >
if [[ $TEST_TARGET == 'doctest' && ${TRAVIS_PYTHON_VERSION} != 3* ]]; then
echo "DOCTEST phase only valid in Python 3 : ABORTING during 'install'."
exit 0
fi
# Install miniconda
# -----------------
- >
echo 'Installing miniconda';
export CONDA_BASE=https://repo.continuum.io/miniconda/Miniconda;
if [[ "$TRAVIS_PYTHON_VERSION" == 2* ]]; then
wget --quiet ${CONDA_BASE}2-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget --quiet ${CONDA_BASE}3-latest-Linux-x86_64.sh -O miniconda.sh;
fi;
bash miniconda.sh -b -p $HOME/miniconda;
export PATH="$HOME/miniconda/bin:$PATH";
# Create the basic testing environment
# ------------------------------------
# Explicitly add defaults channel, see https://github.com/conda/conda/issues/2675
- >
echo 'Configure conda and create an environment';
conda config --set always_yes yes --set changeps1 no;
conda config --set show_channel_urls True;
conda config --add channels conda-forge;
conda update --quiet conda;
ENV_NAME='test-environment';
conda create --quiet -n $ENV_NAME python=$TRAVIS_PYTHON_VERSION pip;
source activate $ENV_NAME;
# Customise the testing environment
# ---------------------------------
- >
echo 'Install Iris dependencies';
CONDA_REQS_FLAGS="";
CONDA_REQS_GROUPS="test";
if [[ "$TRAVIS_PYTHON_VERSION" == 2* ]]; then
CONDA_REQS_FLAGS="${CONDA_REQS_FLAGS} --py2";
fi;
if [[ "$TEST_MINIMAL" != true ]]; then
CONDA_REQS_GROUPS="${CONDA_REQS_GROUPS} all";
fi;
if [[ "${TEST_TARGET}" == 'doctest' ]]; then
CONDA_REQS_GROUPS="${CONDA_REQS_GROUPS} docs";
fi;
CONDA_REQS_FILE=conda-requirements.txt;
python requirements/gen_conda_requirements.py ${CONDA_REQS_FLAGS} --groups ${CONDA_REQS_GROUPS} > ${CONDA_REQS_FILE};
cat ${CONDA_REQS_FILE};
conda install --quiet -n $ENV_NAME --file ${CONDA_REQS_FILE};
- PREFIX=$HOME/miniconda/envs/$ENV_NAME

# Output debug info
- >
conda list -n $ENV_NAME;
conda list -n $ENV_NAME --explicit;
conda info -a;
# Pre-load Natural Earth data to avoid multiple, overlapping downloads.
# i.e. There should be no DownloadWarning reports in the log.
- /usr/bin/python -c 'import cartopy; cartopy.io.shapereader.natural_earth()'

# mo_unpack
- ./.travis_no_output wget https://puma.nerc.ac.uk/trac/UM_TOOLS/raw-attachment/wiki/unpack/unpack-030712.tgz
- ./.travis_no_output tar -xf unpack-030712.tgz
- cd unpack-030712/libmo_unpack
#? - gcc -c -fPIC -O4 -mfpmath=sse -msse -I include -D_LARGEFILE_SOURCE -D_LARGEFILE_SOURCE64 -D_FILE_OFFSET_BITS=64 *.c
- ../../.travis_no_output gcc -c -fPIC -O4 -mfpmath=sse -msse -I include -D_LARGEFILE_SOURCE *.c
- ../../.travis_no_output gcc -shared -Wl,-soname,libmo_unpack.so -o lib/libmo_unpack.so *.o
- ../../.travis_no_output sudo cp lib/* /usr/local/lib
- ../../.travis_no_output sudo cp include/* /usr/local/include
- cd ../..
- python -c 'import cartopy; cartopy.io.shapereader.natural_earth()'

# iris test data
- ./.travis_no_output wget -O iris-test-data.zip https://github.com/SciTools/iris-test-data/archive/${IRIS_TEST_DATA_REF}.zip
- ./.travis_no_output unzip -q iris-test-data.zip
- ln -s $(pwd)/iris-test-data-${IRIS_TEST_DATA_SUFFIX} iris-test-data

# iris sample data
- ./.travis_no_output wget -O iris-sample-data.zip https://github.com/SciTools/iris-sample-data/archive/${IRIS_SAMPLE_DATA_REF}.zip
- ./.travis_no_output unzip -q iris-sample-data.zip
- ln -s $(pwd)/iris-sample-data-${IRIS_SAMPLE_DATA_SUFFIX} iris-sample-data

# iris
- ./.travis_no_output /usr/bin/python setup.py --with-unpack build_ext --inplace -I/usr/local/include -L/usr/local/lib -R/usr/local/lib
- ./.travis_no_output /usr/bin/python setup.py std_names
- echo "[Resources]" > lib/iris/etc/site.cfg
- echo "sample_data_dir = $(pwd)/iris-sample-data/sample_data" >> lib/iris/etc/site.cfg
- echo "test_data_dir = $(pwd)/iris-test-data/test_data" >> lib/iris/etc/site.cfg
- ln -s $(pwd)/lib/iris /home/travis/.local/lib/python2.7/site-packages/iris
- ./.travis_no_output /usr/bin/python setup.py pyke_rules
- >
if [[ "$TEST_MINIMAL" != true ]]; then
wget --quiet -O iris-test-data.zip https://github.com/SciTools/iris-test-data/archive/${IRIS_TEST_DATA_REF}.zip;
unzip -q iris-test-data.zip;
mv "iris-test-data-${IRIS_TEST_DATA_SUFFIX}" iris-test-data;
fi
# set config paths
- >
SITE_CFG=lib/iris/etc/site.cfg;
echo "[Resources]" > $SITE_CFG;
echo "test_data_dir = $(pwd)/iris-test-data/test_data" >> $SITE_CFG;
echo "doc_dir = $(pwd)/docs/iris" >> $SITE_CFG;
echo "[System]" >> $SITE_CFG;
echo "udunits2_path = $PREFIX/lib/libudunits2.so" >> $SITE_CFG;
- python setup.py --quiet install

# JUST FOR NOW : Install latest version of iris-grib.
# TODO : remove when iris doesn't do an integration test requiring iris-grib.
- if [[ "$TEST_MINIMAL" != true && ${TRAVIS_PYTHON_VERSION} == 2* ]]; then
conda install --quiet -n $ENV_NAME python-ecmwf_grib;
pip install git+https://github.com/SciTools/[email protected];
fi

script:
- /usr/bin/python setup.py test --example-tests

- cd $(pwd)/docs/iris
# Make html produces an error when run on Travis that does not affect any downstream functionality but causes the build to fail spuriously.
# The following gets around this error, which should be investigated further in the future.
- echo `make clean html`

- make doctest
- if [[ $TEST_TARGET == 'default' ]]; then
python -m iris.tests.runner --default-tests --system-tests --coding-tests --print-failed-images --num-processors=3;
fi
- if [[ $TEST_TARGET == 'example' ]]; then
python -m iris.tests.runner --example-tests --print-failed-images --num-processors=3;
fi

# Capture install-dir: As a test command must be last for get Travis to check
# the RC, so it's best to start each operation with an absolute cd.
- INSTALL_DIR=$(pwd)

- >
if [[ $TEST_TARGET == 'doctest' ]]; then
MPL_RC_DIR=$HOME/.config/matplotlib;
mkdir -p $MPL_RC_DIR;
echo 'backend : agg' > $MPL_RC_DIR/matplotlibrc;
echo 'image.cmap : viridis' >> $MPL_RC_DIR/matplotlibrc;
cd $INSTALL_DIR/docs/iris;
make clean html && make doctest;
fi
# Split the organisation out of the slug. See https://stackoverflow.com/a/5257398/741316 for description.
- ORG=(${TRAVIS_REPO_SLUG//\// })

# When we merge a change, and we are running in python 3, push some docs.
- if [[ $TEST_TARGET == 'doctest' && ${TRAVIS_EVENT_TYPE} == 'push' && ${TRAVIS_PYTHON_VERSION} == 3* && ${ORG} == "SciTools" ]]; then
cd $INSTALL_DIR;
pip install doctr;
doctr deploy --deploy-repo SciTools-docs/iris --built-docs docs/iris/build/html
--key-path .github/deploy_key.scitools-docs.enc
--no-require-master
${TRAVIS_BRANCH:-${TRAVIS_TAG}};
fi

# An extra call to check "whatsnew" contributions are valid, because the
# Iris test for it needs a *developer* install to be able to find the docs.
- if [[ $TEST_TARGET == 'doctest' ]]; then
cd $INSTALL_DIR/docs/iris/src/whatsnew;
python aggregate_directory.py --checkonly;
fi
20 changes: 0 additions & 20 deletions .travis_no_output

This file was deleted.

Loading

0 comments on commit 29742b7

Please sign in to comment.