Skip to content

Commit

Permalink
Merge branch 'master' into release-0.6.x
Browse files Browse the repository at this point in the history
Conflicts:
	.github/workflows/main.yml
  • Loading branch information
jomey committed Oct 23, 2024
2 parents d3f5d1a + 321e0ef commit d431256
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
groups:
actions:
patterns:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
ls -ltrh
ls -ltrh dist
- name: Publish to Test PyPI
uses: pypa/[email protected].1
uses: pypa/[email protected].3
with:
repository-url: https://test.pypi.org/legacy/
verbose: true
Expand Down Expand Up @@ -98,5 +98,5 @@ jobs:
name: artifact
path: dist

- uses: pypa/[email protected].1
- uses: pypa/[email protected].3
if: startsWith(github.ref, 'refs/tags')
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ name: Code Quality
on:
push:
branches: [ master ]
paths-ignore:
- 'docs/**'
pull_request:
branches: [ master ]
paths-ignore:
- 'docs/**'
jobs:
run:
runs-on: ubuntu-latest
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
paths-ignore:
- 'docs/**'
pull_request:
branches:
- master
- 'release-*'
workflow_dispatch:
paths-ignore:
- 'docs/**'

jobs:
build:
Expand Down
7 changes: 7 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ build:
tools:
python: "3.11"
jobs:
post_checkout:
# https://docs.readthedocs.io/en/stable/build-customization.html#cancel-build-based-on-a-condition
- |
if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/main -- docs/ .readthedocs.yaml;
then
exit 183;
fi
pre_build:
# Generate the Sphinx configuration for this Jupyter Book so it builds.
- "jupyter-book config sphinx docs"
Expand Down
5 changes: 4 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,8 @@ DOI
---
.. |HW22| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.7618102.svg
:target: https://doi.org/10.5281/zenodo.7618102
.. |HW24| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.13312706.svg
:target: https://doi.org/10.5281/zenodo.13312706

* SnowEx Hackweek 2022 - |HW22|
* `SnowEx Hackweek 2022 <https://snowex-2022.hackweek.io/intro.html>`_ - |HW22|
* `SnowEx Hackweek 2024 <https://snowex-2024.hackweek.io/intro.html>`_ - |HW24|

0 comments on commit d431256

Please sign in to comment.