Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into impro-2090_metadata
Browse files Browse the repository at this point in the history
* upstream/master:
  Move wiki to developer guide in docs (metoppv#1456)
  IMPRO-2026: Additional site identifier for spot-cubes and tweaks to existing metadata (metoppv#1458)
  Bilinear/nearest-neighbour  regridding with land-sea mask (metoppv#1438)
  Add tolerance in grid even-spacing checking & calculation (metoppv#1459)
  Removes unused import statements (metoppv#1461)
  Fix metadata interpreter acceptance tests skipping (metoppv#1455)

# Conflicts:
#	improver/standardise.py
  • Loading branch information
MoseleyS committed May 18, 2021
2 parents c1945b0 + 412aded commit 7c47ec8
Show file tree
Hide file tree
Showing 47 changed files with 4,539 additions and 510 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: |
source '/usr/share/miniconda/etc/profile.d/conda.sh'
conda activate improver_${{ matrix.env }}
pytest -m "not acc" --cov=improver --cov-report xml:coverage.xml
pytest --cov=improver --cov-report xml:coverage.xml
- name: codacy-coverage
if: env.CODACY_PROJECT_TOKEN
run: |
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
etc/site-init

# Files from build of doc
*.rst
doc/source/modules.rst
doc/source/improver*.rst
!/doc/source/extended_documentation/**
/doc/build/

Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ request is merged into master.

We have a checklist for making sure code is ready to merge in:

https://github.com/metoppv/improver/wiki/Definition-of-Done
https://improver.readthedocs.io/Definition-of-Done.html

and guidance for going through the review process:

https://github.com/metoppv/improver/wiki/Guidance-for-Reviewing-Code

https://improver.readthedocs.io/Guidance-for-Reviewing-Code.html

## Code Contributors

Expand All @@ -41,13 +40,14 @@ below:
* James Canvin (Bureau of Meteorology, Australia)
* Neil Crosswaite (Met Office, UK)
* Gavin Evans (Met Office, UK)
* Zhiliang Fan (Bureau of Meteorology, Australia)
* Ben Fitzpatrick (Met Office, UK)
* Martina Friedrich (Met Office, UK, pre-GitHub)
* Tom Gale (Bureau of Meteorology, Australia)
* Aaron Hopkinson (Met Office, UK)
* Kathryn Howard (Met Office, UK)
* Tim Hume (Bureau of Meteorology, Australia)
* Katharine Hurst (Met Office, UK)
* Katharine Hurst (Met Office, UK)
* Simon Jackson (Met Office, UK)
* Caroline Jones (Met Office, UK)
* Bruno P. Kinoshita (NIWA, NZ)
Expand Down
Loading

0 comments on commit 7c47ec8

Please sign in to comment.