Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into apidoc
Browse files Browse the repository at this point in the history
* upstream/main: (274 commits)
  Cf cell method (SciTools#5224)
  Bump scitools/workflows from 2023.03.3 to 2023.04.1 (SciTools#5231)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5230)
  Bump scitools/workflows from 2023.03.2 to 2023.03.3 (SciTools#5227)
  raise dask min pin (SciTools#5225)
  Enable lazy computation of wind vector rotation (SciTools#4972)
  Benchmark runner script (SciTools#5215)
  add locks readme (SciTools#5222)
  use explicit version for ci refresh-lockfiles gha (SciTools#5221)
  SciTools#5180 do not run publish-to-test-pypi on forks (SciTools#5220)
  Fix Makefile for consequences of SciTools#5204. (SciTools#5217)
  Bump actions/stale from 7 to 8 (SciTools#5208)
  Remove Iris' TestRunner (SciTools#5205)
  standardize requirements structure (SciTools#5204)
  Updated environment lockfiles (SciTools#5199)
  Add histogram convenience for passing Iris objects to plt.hist (SciTools#5189)
  Updated environment lockfiles (SciTools#5192)
  announce new contributor in whatsnew (SciTools#5198)
  iris.util.new_axis anonymous new dimension fix (SciTools#5194)
  Lockfiles and pydata-sphinx-theme fix (SciTools#5188)
  ...
  • Loading branch information
tkknight committed Apr 4, 2023
2 parents 376d916 + 1a92b5c commit 1e79eea
Show file tree
Hide file tree
Showing 734 changed files with 25,641 additions and 12,453 deletions.
198 changes: 0 additions & 198 deletions .cirrus.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node: $Format:%H$
node-date: $Format:%cI$
describe-name: $Format:%(describe:tags=true)$
ref-names: $Format:%D$
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.git_archival.txt export-subst
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "\U0001F41B Bug Report"
about: Submit a bug report to help us improve Iris
title: ''
labels: 'New: Issue, Type: Bug'
labels: 'Type: Bug'
assignees: ''

---
Expand Down
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ contact_links:
- name: 💬 Iris GitHub Discussions
url: https://github.com/SciTools/iris/discussions
about: Engage with the Iris community to discuss your issue
- name: ❓ Usage Question
url: https://github.com/SciTools/iris/discussions/categories/q-a
about: Raise a question about how to use Iris in the Q&A section of Discussions
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: "\U0001F4DA Documentation"
about: Report an issue with the Iris documentation
title: ''
labels: 'New: Documentation, Type: Documentation'
labels: 'Type: Documentation'
assignees: ''

---
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name: "✨ Feature Request"
about: Submit a request for a new feature in Iris
title: ''
labels: 'New: Feature'
assignees: ''

---
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name: "\U0001F4F0 Custom Issue"
about: Submit a generic issue to help us improve Iris
title: ''
labels: 'New: Issue'
assignees: ''

---
Expand Down
31 changes: 22 additions & 9 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ on:
schedule:
# Runs every day at 23:00.
- cron: "0 23 * * *"
workflow_dispatch:
inputs:
first_commit:
description: "Argument to be passed to the overnight benchmark script."
required: false
type: string

jobs:
benchmark:
Expand All @@ -15,21 +21,20 @@ jobs:
env:
IRIS_TEST_DATA_LOC_PATH: benchmarks
IRIS_TEST_DATA_PATH: benchmarks/iris-test-data
IRIS_TEST_DATA_VERSION: "2.5"
IRIS_TEST_DATA_VERSION: "2.19"
# Lets us manually bump the cache to rebuild
ENV_CACHE_BUILD: "0"
TEST_DATA_CACHE_BUILD: "2"
PY_VER: 3.8

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Install Nox
- name: Install ASV & Nox
run: |
pip install nox
pip install asv nox
- name: Cache environment directories
id: cache-env-dir
Expand Down Expand Up @@ -64,10 +69,15 @@ jobs:
- name: Run overnight benchmarks
run: |
first_commit=$(git log --after="$(date -d "1 day ago" +"%Y-%m-%d") 23:00:00" --pretty=format:"%h" | tail -n 1)
first_commit=${{ inputs.first_commit }}
if [ "$first_commit" == "" ]
then
first_commit=$(git log --after="$(date -d "1 day ago" +"%Y-%m-%d") 23:00:00" --pretty=format:"%h" | tail -n 1)
fi
if [ "$first_commit" != "" ]
then
nox --session="benchmarks(overnight)" -- $first_commit
python benchmarks/bm_runner.py overnight $first_commit
fi
- name: Create issues for performance shifts
Expand All @@ -93,8 +103,11 @@ jobs:
fi
title="Performance Shift(s): \`$commit\`"
body="
Benchmark comparison has identified performance shifts at commit \
$commit (#$pr_number). Please review the report below and \
Benchmark comparison has identified performance shifts at
* commit $commit (#$pr_number).
Please review the report below and \
take corrective/congratulatory action as appropriate \
:slightly_smiling_face:
Expand All @@ -115,7 +128,7 @@ jobs:
- name: Archive asv results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: asv-report
path: |
Expand Down
Loading

0 comments on commit 1e79eea

Please sign in to comment.