Skip to content

Commit

Permalink
Merge branch 'main' into perfmetric_python
Browse files Browse the repository at this point in the history
  • Loading branch information
schlunma authored Jan 22, 2025
2 parents 4980091 + c84868e commit 0c0104e
Show file tree
Hide file tree
Showing 39 changed files with 4,024 additions and 449 deletions.
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ commands:
# Install
. /opt/conda/etc/profile.d/conda.sh
mkdir /logs
mamba env create >> /logs/conda.txt 2>&1
mamba env create
conda activate esmvaltool
mamba list >> /logs/conda.txt
pip install << parameters.flags >> ".[<<parameters.extra>>]"> /logs/install.txt 2>&1
esmvaltool install Julia > /logs/install_julia.txt 2>&1
if [[ "<<parameters.flags>>" != *'--editable'* ]]
Expand Down Expand Up @@ -201,8 +202,9 @@ jobs:
# https://docs.esmvaltool.org/en/latest/quickstart/installation.html#install-from-source
. /opt/conda/etc/profile.d/conda.sh
mkdir /logs
mamba env create >> /logs/conda.txt 2>&1
mamba env create
conda activate esmvaltool
mamba list >> /logs/conda.txt
pip install --editable .[develop]
esmvaltool install Julia > /logs/install_julia.txt 2>&1
git clone https://github.com/ESMValGroup/ESMValCore $HOME/ESMValCore
Expand Down
25 changes: 10 additions & 15 deletions .github/workflows/check-rtw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ on:
# Triggers the workflow on push events
push:
paths:
# - esmvaltool/utils/recipe_test_workflow/**
- esmvaltool/utils/recipe_test_workflow/**

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
# Schedule this workflow to run at 04:00 every 10 days
schedule:
- cron: '0 4 */10 * *'

# Common variables are defined here
env:
Expand All @@ -33,19 +34,13 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job
# can access it
- uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: "latest"
miniforge-variant: Miniforge3
use-mamba: true
conda-remove-defaults: "true"

- name: Install Cylc and Rose
run: conda install cylc-flow>=8.2 cylc-rose metomi-rose
- name: Checkout repository
uses: actions/checkout@v4

- name: Check current environment
run: conda list
- name: Setup Cylc
uses: cylc/setup-cylc@v1
with:
cylc_rose: true

- name: Validate Cylc workflow
run: |
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/cron_esmvalbot_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Run Esmvalbot Test

on:
# push:
# branches:
# - cron_esmvalbot_test
# scheduled once every 2 weeks
schedule:
- cron: '0 4 */14 * *'

# Required shell entrypoint to have properly configured bash shell
defaults:
run:
shell: bash -l {0}

jobs:
run-esmvalbot:
runs-on: 'ubuntu-latest'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Create empty commit on branch
run: |
git config user.name 'Valeriu Predoi'
git config user.email '[email protected]'
git commit --allow-empty -m "empty commit"
# Automated PR where we run "@esmvalbot please run examples/recipe_python.yml"
# as comment in the PR
# see https://github.com/marketplace/actions/create-pull-request
- name: Create Auto PR
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: empty message
# defaults are GH bot: # ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
committer: Valeriu Predoi <[email protected]>
author: Valeriu Predoi <[email protected]>
signoff: false
branch: run-esmvalbot
delete-branch: true
title: '[EsmvalbotTest] Periodic reminder to run an esmvalbot test'
body: 'Automatic PR; please DO NOT merge! This is for testing Esmvalbot only. @valeriupredoi @bouweandela @schlunma please run an ESMValBot test here; if the bot runs fine, please close the auto PR, if it has issues, please open a Github issue and tag @valeriupredoi. Many thanks :beers:'
labels: |
testing
esmvalbot
automatedPR
assignees: valeriupredoi
reviewers: valeriupredoi
draft: true
17 changes: 15 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,16 @@ build:
# DO NOT use mambaforge-*; that is currently sunsetted
python: "miniconda-latest"
jobs:
post_create_environment:
- conda run -n ${CONDA_DEFAULT_ENV} pip install . --no-deps
post_checkout:
# The ESMValTool repository is shallow i.e., has a .git/shallow,
# therefore complete the repository with a full history in order
# to allow setuptools-scm to correctly auto-discover the version.
- git fetch --unshallow
- git fetch --all
pre_install:
- git stash
post_install:
- git stash pop

# Declare the requirements required to build your docs
conda:
Expand All @@ -26,6 +34,11 @@ sphinx:
configuration: doc/sphinx/source/conf.py
fail_on_warning: true

python:
install:
- method: pip
path: .

# If using Sphinx, optionally build your docs in additional formats such as PDF
formats:
- pdf
14 changes: 14 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Security Policy

## Supported Versions

Only the [latest version][latest] of ESMValTool is currently being supported
with security updates.

## Reporting a Vulnerability

If you find a vulnerability, please contact the
[ESMValTool Tech Lead Team][TLT].

[latest]: https://github.com/ESMValGroup/ESMValTool/releases
[TLT]: mailto:[email protected]
Loading

0 comments on commit 0c0104e

Please sign in to comment.