Skip to content

Commit

Permalink
Merge pull request #73 from ecmwf/master
Browse files Browse the repository at this point in the history
Merge master to develop
  • Loading branch information
sandorkertesz committed May 3, 2024
2 parents b4cee9c + ca832c3 commit fecbc15
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 1 deletion.
7 changes: 7 additions & 0 deletions .github/ci-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dependencies: |
ecmwf/ecbuild
MathisRosenhauer/libaec@master
ecmwf/eccodes
dependency_branch: develop
parallelism_factor: 8
self_build: false
14 changes: 14 additions & 0 deletions .github/ci-hpc-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
build:
python: '3.10'
modules:
- ninja
dependencies:
- ecmwf/ecbuild@develop
- ecmwf/eccodes@develop
python_dependencies:
- ecmwf/eccodes-python@develop
env:
- ECCODES_SAMPLES_PATH=$ECCODES_DIR/share/eccodes/samples
- ECCODES_DEFINITION_PATH=$ECCODES_DIR/share/eccodes/definitions
parallel: 64
requirements: tests/downstream-ci-requirements.txt
76 changes: 76 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: ci

on:
# Trigger the workflow on push to master or develop, except tag creation
push:
branches:
- 'master'
- 'develop'
tags-ignore:
- '**'

# Trigger the workflow on pull request
pull_request: ~

# Trigger the workflow manually
workflow_dispatch: ~

# Trigger after public PR approved for CI
pull_request_target:
types: [labeled]

jobs:
# Run CI including downstream packages on self-hosted runners
downstream-ci:
name: downstream-ci
if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@main
with:
pdbufr: ecmwf/pdbufr@${{ github.event.pull_request.head.sha || github.sha }}
codecov_upload: true
secrets: inherit

# # Run CI of private downstream packages on self-hosted runners
# private-downstream-ci:
# name: private-downstream-ci
# needs: [downstream-ci]
# if: (success() || failure()) && ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
# runs-on: ubuntu-latest
# permissions:
# pull-requests: write
# steps:
# - name: Dispatch private downstream CI
# uses: ecmwf-actions/dispatch-private-downstream-ci@v1
# with:
# token: ${{ secrets.GH_REPO_READ_TOKEN }}
# owner: ecmwf-actions
# repository: private-downstream-ci
# event_type: downstream-ci
# payload: '{"metkit": "ecmwf/metkit@${{ github.event.pull_request.head.sha || github.sha }}"}'

# Build downstream packages on HPC
downstream-ci-hpc:
name: downstream-ci-hpc
if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci-hpc.yml@main
with:
pdbufr: ecmwf/pdbufr@${{ github.event.pull_request.head.sha || github.sha }}
secrets: inherit

# # Run CI of private downstream packages on HPC
# private-downstream-ci-hpc:
# name: private-downstream-ci-hpc
# needs: [downstream-ci-hpc]
# if: (success() || failure()) && ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
# runs-on: ubuntu-latest
# permissions:
# pull-requests: write
# steps:
# - name: Dispatch private downstream CI
# uses: ecmwf-actions/dispatch-private-downstream-ci@v1
# with:
# token: ${{ secrets.GH_REPO_READ_TOKEN }}
# owner: ecmwf-actions
# repository: private-downstream-ci
# event_type: downstream-ci-hpc
# payload: '{"metkit": "ecmwf/metkit@${{ github.event.pull_request.head.sha || github.sha }}"}'
10 changes: 10 additions & 0 deletions .github/workflows/label-public-pr-yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Manage labels of pull requests that originate from forks
name: label-public-pr

on:
pull_request_target:
types: [opened, synchronize]

jobs:
label:
uses: ecmwf-actions/reusable-workflows/.github/workflows/label-pr.yml@v2
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ recursive-include tests *.py
recursive-include tests *.yml
recursive-include tests *.csv
recursive-include docs *
recursive-include tests *.txt

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def parse_version_from(path: str) -> str:
url="https://github.com/ecmwf/pdbufr",
packages=setuptools.find_packages(),
include_package_data=True,
install_requires=["attrs", "eccodes", "pandas"],
install_requires=["attrs", "eccodes", "pandas", "hypothesis"],
extras_require={"tests": ["flake8", "pytest", "pytest-cov", "requests"]},
zip_safe=True,
keywords="eccodes bufr pandas",
Expand Down
1 change: 1 addition & 0 deletions tests/downstream-ci-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
requests

0 comments on commit fecbc15

Please sign in to comment.